diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-26 19:38:46 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-26 19:38:46 (GMT) |
| commit | 1a1eeba0086d764474546da7fe443bf210d4d974 (patch) | |
| tree | 8d42fbce05e87c2908fcec8572a61c6501be5f15 /tests/benchmarks/benchmarks.pro | |
| parent | 63bd10ae61ed0b877344b217e57eb87f77256e98 (diff) | |
| parent | 53abbf0cedbf2e3478e63c1b007d27a943df630d (diff) | |
| download | Qt-1a1eeba0086d764474546da7fe443bf210d4d974.zip Qt-1a1eeba0086d764474546da7fe443bf210d4d974.tar.gz Qt-1a1eeba0086d764474546da7fe443bf210d4d974.tar.bz2 | |
Merge branch '4.5' into 4.6-staging
Conflicts:
tests/benchmarks/benchmarks.pro
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 bb20dcf..0f760a1 100644 --- a/tests/benchmarks/benchmarks.pro +++ b/tests/benchmarks/benchmarks.pro @@ -5,6 +5,7 @@ SUBDIRS = containers-associative \ qbytearray \ qfileinfo \ qfile_vs_qnetworkaccessmanager \ + qhostinfo \ qpainter \ qtestlib-simple events \ qiodevice \ |