diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 04:36:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 04:36:48 (GMT) |
| commit | b86eac6486c77121cfae897427317885fe339d40 (patch) | |
| tree | 1b49c220af01d0153c0fe7e05561c379a1f6d39f | |
| parent | 77edce14629b665924e89b1f22f902ceb010c964 (diff) | |
| parent | f90ce20ad1c7feec9b72fdeda42ab56fe7c079c5 (diff) | |
| download | Qt-b86eac6486c77121cfae897427317885fe339d40.zip Qt-b86eac6486c77121cfae897427317885fe339d40.tar.gz Qt-b86eac6486c77121cfae897427317885fe339d40.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed some network tests never being run.
| -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 bda03d3..c3ca58a 100644 --- a/tests/auto/network.pro +++ b/tests/auto/network.pro @@ -31,7 +31,7 @@ SUBDIRS=\ qsslkey \ qsslsocket \ -contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ qhttpnetworkconnection \ qhttpnetworkreply \ qnativesocketengine \ |