diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-01 14:02:36 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-01 14:02:36 +0100 |
| commit | 0533cd3a773952490eb0e5686afb7b235799a13f (patch) | |
| tree | a1f14fe42a51499666921d58a6a5b62f1f916d8e /tests/auto/qglthreads/tst_qglthreads.cpp | |
| parent | 9c132451acc7fbed1611fd3676cceb26e815f50d (diff) | |
| parent | e5974b024828578945bd4c349f5f87f82a635225 (diff) | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
mkspecs/features/symbian/application_icon.prf
src/sql/drivers/odbc/qsql_odbc.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 434fd9d161..45c8cbcd24 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)); |