diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-29 18:31:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-29 18:31:28 (GMT) |
| commit | 8bf770a1c9c28781aa8bfdea13df5194fac13573 (patch) | |
| tree | f22919fbaa81448b9b1ff0f82f9bcd18a6e54633 /tests | |
| parent | 5c91e32a6238fd112a7282443214c8686cda51de (diff) | |
| parent | be4d3182e48dcae70837f26d76dd449d914e8cb3 (diff) | |
| download | Qt-8bf770a1c9c28781aa8bfdea13df5194fac13573.zip Qt-8bf770a1c9c28781aa8bfdea13df5194fac13573.tar.gz Qt-8bf770a1c9c28781aa8bfdea13df5194fac13573.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix generated mif file cleaning in symbian-abld
Fix typo in qglthreads auto test.
Orientation control implementation for Symbian
No longer replace dash and dot in TARGET with underscore in Symbian
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qglthreads/tst_qglthreads.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/qglthreads/tst_qglthreads.cpp index 0bcc4f6..65bebb0 100644 --- a/tests/auto/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/qglthreads/tst_qglthreads.cpp @@ -216,7 +216,7 @@ public: // That's why we create only small textures. width = 50; height = 20; -#else +#endif QImage image(width, height, QImage::Format_RGB32); QPainter p(&image); p.fillRect(image.rect(), QColor(rand() % 256, rand() % 256, rand() % 256)); |