summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/gui/gui.pro
diff options
context:
space:
mode:
authorWater-Team <water@pad.test.qt.nokia.com>2011-07-26 23:00:12 (GMT)
committerWater-Team <water@pad.test.qt.nokia.com>2011-07-26 23:00:12 (GMT)
commita92f10160c94af56bdcbc1f40784a28273563b5c (patch)
tree7277454c7d563a6d67a31e2cded502639a011794 /tests/benchmarks/gui/gui.pro
parenta9f3783e9402354f7211c9c293627b34f1080251 (diff)
parentaa19362a14ce20bde2ada61edf7b946019845ed2 (diff)
downloadQt-a92f10160c94af56bdcbc1f40784a28273563b5c.zip
Qt-a92f10160c94af56bdcbc1f40784a28273563b5c.tar.gz
Qt-a92f10160c94af56bdcbc1f40784a28273563b5c.tar.bz2
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'tests/benchmarks/gui/gui.pro')
-rw-r--r--tests/benchmarks/gui/gui.pro5
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)