diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-22 05:44:14 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-22 05:44:14 (GMT) |
| commit | 572ebf1586f4e995527eee126fcf0bd4fdb18bee (patch) | |
| tree | 39b6d2b81faf1804bb409751e09e91fcadf2f3f7 /tests/auto/network.pro | |
| parent | 2cc9a9a51d6742708b1ea41c7338755e2a0ee9e9 (diff) | |
| parent | 3ba4e43507cc2ca1f642a45aec4fda4bd3572678 (diff) | |
| download | Qt-572ebf1586f4e995527eee126fcf0bd4fdb18bee.zip Qt-572ebf1586f4e995527eee126fcf0bd4fdb18bee.tar.gz Qt-572ebf1586f4e995527eee126fcf0bd4fdb18bee.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
tests/auto/qgl_threads/qgl_threads.pro
Diffstat (limited to 'tests/auto/network.pro')
| -rw-r--r-- | tests/auto/network.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/network.pro b/tests/auto/network.pro index 2a7c178..4f205fe 100644 --- a/tests/auto/network.pro +++ b/tests/auto/network.pro @@ -18,8 +18,8 @@ SUBDIRS=\ qnativesocketengine \ qnetworkaccessmanager \ qnetworkaddressentry \ - qnetworkconfigmanager \ qnetworkconfiguration \ + qnetworkconfigurationmanager \ qnetworkcookie \ qnetworkcookiejar \ qnetworkinterface \ |