diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-17 23:46:27 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-17 23:46:27 (GMT) |
| commit | a60c9a1ff41e5ca1482121ff3f89a112b359b6d4 (patch) | |
| tree | ebe4f5e941eb3bda28593c2b170101867cb0afe3 /tests/benchmarks/benchmarks.pro | |
| parent | 412920402f488c2cf6eb81e7582f9b5aa7b06680 (diff) | |
| parent | b8a4b365b1105a742369bbaa5dc00e43914089e0 (diff) | |
| download | Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.zip Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.tar.gz Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
.gitignore
tests/benchmarks/benchmarks.pro
Diffstat (limited to 'tests/benchmarks/benchmarks.pro')
| -rw-r--r-- | tests/benchmarks/benchmarks.pro | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro index ae3c25a..cd37db1 100644 --- a/tests/benchmarks/benchmarks.pro +++ b/tests/benchmarks/benchmarks.pro @@ -21,13 +21,21 @@ SUBDIRS = containers-associative \ qvariant \ qwidget \ qtwidgets \ - qmlxmlparser \ - qfxview \ + qapplication \ + qdir \ + qdiriterator \ + qgraphicsanchorlayout \ + qgraphicsitem \ + qgraphicswidget \ + qmetaobject \ + qpixmapcache \ + qquaternion \ + qscriptclass \ + qscriptengine \ + qscriptvalue \ + qstringbuilder \ + qstylesheetstyle \ + qsvgrenderer \ + qtableview contains(QT_CONFIG, opengl): SUBDIRS += opengl - -# Tests which should run in Pulse -PULSE_TESTS = \ - qfxview \ - qmlxmlparser \ - |