diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-26 04:34:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-26 04:34:17 (GMT) |
| commit | aa19362a14ce20bde2ada61edf7b946019845ed2 (patch) | |
| tree | fe31f6c8bddb37c5aa93a5f41d1a3d0e1eb6fc48 /tests/benchmarks/gui/gui.pro | |
| parent | 9d5f03fceb43946b4db0731f66c2f27c01d3cd6f (diff) | |
| parent | 4866d1ba8afbab61e102942d1ea93b81fea053d6 (diff) | |
| download | Qt-aa19362a14ce20bde2ada61edf7b946019845ed2.zip Qt-aa19362a14ce20bde2ada61edf7b946019845ed2.tar.gz Qt-aa19362a14ce20bde2ada61edf7b946019845ed2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
Add test case name and drop parentheses for -datatags option.
Adding QTDIR validation in tst_symbols autotest
Disabled benchmarks referring to private headers.
Add license header to printdatatags autotests
Compile on symbian^3
Compile on Symbian^3.
Added -datatags option to QTestLib
Fixed failure of tst_qxmlquery::evaluateToReceiver
Diffstat (limited to 'tests/benchmarks/gui/gui.pro')
| -rw-r--r-- | tests/benchmarks/gui/gui.pro | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/benchmarks/gui/gui.pro b/tests/benchmarks/gui/gui.pro index d825458..06828f4 100644 --- a/tests/benchmarks/gui/gui.pro +++ b/tests/benchmarks/gui/gui.pro @@ -12,7 +12,6 @@ SUBDIRS = \ TRUSTED_BENCHMARKS += \ graphicsview/functional/GraphicsViewBenchmark \ - graphicsview/qgraphicsview \ - painting/qtracebench + graphicsview/qgraphicsview -include(../trusted-benchmarks.pri)
\ No newline at end of file +include(../trusted-benchmarks.pri) |