diff options
| author | axis <qt-info@nokia.com> | 2011-02-24 16:07:22 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-02-24 16:07:22 (GMT) |
| commit | 2b768ad7d4de4862584762a7d106d9cfcc3416df (patch) | |
| tree | 0ddfe84f345d7e61ce71daa51fbbfb373c3e3106 /tests/auto/qglthreads/tst_qglthreads.cpp | |
| parent | bb7d9bcc8e0c617091e91f7a40f3d33f8c1cdec1 (diff) | |
| parent | ca7be48b7a150952a9657d1000941fb986e5bb2b (diff) | |
| download | Qt-2b768ad7d4de4862584762a7d106d9cfcc3416df.zip Qt-2b768ad7d4de4862584762a7d106d9cfcc3416df.tar.gz Qt-2b768ad7d4de4862584762a7d106d9cfcc3416df.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
Conflicts:
src/network/access/qnetworkreplyimpl.cpp
tests/auto/moc/tst_moc.cpp
Diffstat (limited to 'tests/auto/qglthreads/tst_qglthreads.cpp')
| -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 434fd9d..45c8cbc 100644 --- a/tests/auto/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/qglthreads/tst_qglthreads.cpp @@ -210,7 +210,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)); |