diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-07-17 23:32:27 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-07-17 23:32:27 (GMT) |
| commit | 15efa03d234aa51b0c24c68c18a98dce0d66bdff (patch) | |
| tree | 19116918f6aa138197831c2cb86e1adcce120dea /tests | |
| parent | 8d545a21b6aa89675b404a9d7bf08b7499d26e5e (diff) | |
| parent | b86eac6486c77121cfae897427317885fe339d40 (diff) | |
| download | Qt-15efa03d234aa51b0c24c68c18a98dce0d66bdff.zip Qt-15efa03d234aa51b0c24c68c18a98dce0d66bdff.tar.gz Qt-15efa03d234aa51b0c24c68c18a98dce0d66bdff.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.7-from-4.6
Conflicts:
tests/auto/network.pro
Diffstat (limited to 'tests')
| -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 e1898f1..31c754c 100644 --- a/tests/auto/network.pro +++ b/tests/auto/network.pro @@ -36,7 +36,7 @@ SUBDIRS=\ qsslkey \ qsslsocket \ -contains(QT_CONFIG, private_tests): SUBDIRS -= \ +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ qauthenticator \ qhttpnetworkconnection \ qhttpnetworkreply \ |