diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-02 02:41:42 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-02 02:41:42 (GMT) |
commit | 662666a5d4d114f91dbed8cbe3ce46fddfe3c82b (patch) | |
tree | 0b72d67d46bf1693e1b3e2b8669fef8c8c89e766 /tests/benchmarks/benchmarks.pro | |
parent | 35a211cd95e0d09ef0b547b57f01f0a9ff41da2f (diff) | |
parent | 64ca7030df6189a0bc4df36473befd868c8d2ef6 (diff) | |
download | Qt-662666a5d4d114f91dbed8cbe3ce46fddfe3c82b.zip Qt-662666a5d4d114f91dbed8cbe3ce46fddfe3c82b.tar.gz Qt-662666a5d4d114f91dbed8cbe3ce46fddfe3c82b.tar.bz2 |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
tools/linguist/lupdate/main.cpp
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 7ea4f24..a7ec85b 100644 --- a/tests/benchmarks/benchmarks.pro +++ b/tests/benchmarks/benchmarks.pro @@ -5,6 +5,7 @@ SUBDIRS = containers-associative \ qbytearray \ qfileinfo \ qfile_vs_qnetworkaccessmanager \ + qfontmetrics \ qhostinfo \ qpainter \ qtestlib-simple events \ |