diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-10-23 12:57:30 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-10-23 12:57:30 (GMT) |
| commit | 4ff3e1ca7ce8afab49e5c52a1ae0141abfc8a841 (patch) | |
| tree | 592d015d93478525504f8e09154b633fa2abdae2 /tests/benchmarks/benchmarks.pro | |
| parent | c21d3a0094b0692f2f888b04e258229234200e3c (diff) | |
| parent | 05aaab72d69a7fa9c23811c1d3ee7d91a9174e46 (diff) | |
| download | Qt-4ff3e1ca7ce8afab49e5c52a1ae0141abfc8a841.zip Qt-4ff3e1ca7ce8afab49e5c52a1ae0141abfc8a841.tar.gz Qt-4ff3e1ca7ce8afab49e5c52a1ae0141abfc8a841.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qscriptprogram
Conflicts:
src/script/api/qscriptengine.cpp
tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
Diffstat (limited to 'tests/benchmarks/benchmarks.pro')
| -rw-r--r-- | tests/benchmarks/benchmarks.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro index ad1920b..a63fb41 100644 --- a/tests/benchmarks/benchmarks.pro +++ b/tests/benchmarks/benchmarks.pro @@ -9,8 +9,8 @@ SUBDIRS = containers-associative \ qiodevice \ qpixmap \ blendbench \ - qstring \ - qstringlist \ + qstring \ + qstringlist \ qmatrix4x4 \ qnetworkreply \ qobject \ |