diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-21 20:07:26 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-21 20:07:26 (GMT) |
| commit | 26eda5fa33e401a1803b42e6eacf0921ddc6a14e (patch) | |
| tree | 510cff78e0dcdd8a3b0d70dea9c270b37d8ac57d /tests/benchmarks/benchmarks.pro | |
| parent | fad27a3b6f018a0bc3cb261c81aaefc540589585 (diff) | |
| parent | 58574ea3590fbb28da5be73b983d83f0a8824d00 (diff) | |
| download | Qt-26eda5fa33e401a1803b42e6eacf0921ddc6a14e.zip Qt-26eda5fa33e401a1803b42e6eacf0921ddc6a14e.tar.gz Qt-26eda5fa33e401a1803b42e6eacf0921ddc6a14e.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
src/gui/widgets/qmenu_mac.mm
tests/benchmarks/benchmarks.pro
tests/benchmarks/qnetworkreply/tst_qnetworkreply.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 \ |