diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 12:57:58 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 12:57:58 +0100 |
| commit | 477bf4379b0eb7b9a44f4730ce9b8fc07a8e635e (patch) | |
| tree | fef39cfe5893d8203d34ffa41d914ce210703f94 /tests/auto/auto.pro | |
| parent | 7e7cbe2152efe47972e11875f008ddb8f0cc78db (diff) | |
| parent | c3f85f9f3a15c7e880d1d2b10ef6b98881f7f87c (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (126 commits)
Skip OpenGL threading tests on Mac as they were causing reboots
Fixed compile of autotests.
Fix warnings on gcc
Add experimental VBO support for drawCachedGlyphs()'s index array
Fix threaded gl autotest build failure on GLES2
Removed redundant debug output from trace benchmark.
Added two QML based traces to trace benchmark.
Fixed old trace files no longer working.
Reduced the memory footprint of qttrace files.
Added trace replayer benchmark.
Added --range and --single arguments to qttracereplay.
Always accept values reported directly using QTest::setBenchmarkResult.
Make threading use-cases work for X11
Run firstRun initialization in declarative/painting benchmark
Optimization for text drawing on OpenGL
Enable QStaticText in QtDeclarative painting benchmark
Fix no-webkit compiler helpviewer
Make sure height of glyph cache is a power of two
Fixes crash when destroying a QGraphicsItem.
Move benchmarks/qvector to benchmarks/corelib/tools/qvector
...
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 6a0645b993..428c88907d 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -476,7 +476,7 @@ SUBDIRS += \ rcc \ windowsmobile -contains(QT_CONFIG,opengl):SUBDIRS += qgl qglbuffer +contains(QT_CONFIG,opengl):SUBDIRS += qgl qglbuffer qgl_threads contains(QT_CONFIG,qt3support):!wince*:SUBDIRS += $$Q3SUBDIRS |