diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-26 07:41:06 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-26 07:41:06 (GMT) |
commit | 12ebfedc3de64e99082ca573351bdd24b1d42370 (patch) | |
tree | 0290b22723ae07fb4b11e6f5008e5bae2050a12b /tests/benchmarks/benchmarks.pro | |
parent | 7ffe42d376b574239480b38b8f6430339b806daa (diff) | |
parent | baec0ecd314c6e9563bd56cf19571ca71d7d11cd (diff) | |
download | Qt-12ebfedc3de64e99082ca573351bdd24b1d42370.zip Qt-12ebfedc3de64e99082ca573351bdd24b1d42370.tar.gz Qt-12ebfedc3de64e99082ca573351bdd24b1d42370.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/corelib/kernel/qcoreevent.h
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'tests/benchmarks/benchmarks.pro')
-rw-r--r-- | tests/benchmarks/benchmarks.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro index 8e2c243..4c39373 100644 --- a/tests/benchmarks/benchmarks.pro +++ b/tests/benchmarks/benchmarks.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS = containers-associative \ containers-sequential \ + qanimation \ qbytearray \ qpainter \ qtestlib-simple events \ |