diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-12 21:59:46 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-12 21:59:46 (GMT) |
| commit | f129de853154dc1d72cb5651606ca009c3b1f814 (patch) | |
| tree | 8d500bcf8e6ef1f6a5f4ea0bc63f1810e6b167ff /tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro | |
| parent | 1aa4cfab2d437210b8c0b064fa3bd071e53374c1 (diff) | |
| parent | 0293aff5c44202e5c62e229b74d8bd0bf9206185 (diff) | |
| download | Qt-f129de853154dc1d72cb5651606ca009c3b1f814.zip Qt-f129de853154dc1d72cb5651606ca009c3b1f814.tar.gz Qt-f129de853154dc1d72cb5651606ca009c3b1f814.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
Diffstat (limited to 'tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro')
| -rw-r--r-- | tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro index 5ce3a2d..0021bc1 100644 --- a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -1,7 +1,6 @@ load(qttest_p4) SOURCES += tst_qhttpnetworkconnection.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib - requires(contains(QT_CONFIG,private_tests)) QT = core network |