diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-09 14:59:40 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-10 11:52:30 +0100 |
| commit | 2304acab5ff3bd3832c2e388cfdab27f2a95caa8 (patch) | |
| tree | 836fda9d762ec9c4f8461804f1e2d22cdf16303f /tests/auto/network/kernel | |
| parent | b94b7687b0635ee74a3ccd83a234ead0600fd47f (diff) | |
CMake: Regenerate projects using pro2cmake one last time
And fix up some wrong qmake project files
Pick-to: 6.0
Change-Id: I66cb82aeb9c1419a74df1a650fa78a511ade7443
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/network/kernel')
| -rw-r--r-- | tests/auto/network/kernel/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tests/auto/network/kernel/kernel.pro | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/tests/auto/network/kernel/CMakeLists.txt b/tests/auto/network/kernel/CMakeLists.txt index 0b25020694..8b8960d0ae 100644 --- a/tests/auto/network/kernel/CMakeLists.txt +++ b/tests/auto/network/kernel/CMakeLists.txt @@ -1,14 +1,16 @@ +# Generated from kernel.pro. + add_subdirectory(qdnslookup) add_subdirectory(qdnslookup_appless) +add_subdirectory(qnetworkproxyfactory) +add_subdirectory(qnetworkproxy) add_subdirectory(qnetworkinterface) add_subdirectory(qnetworkdatagram) add_subdirectory(qnetworkaddressentry) add_subdirectory(qhostaddress) - +if(QT_FEATURE_private_tests AND NOT MACOS) + add_subdirectory(qhostinfo) +endif() if(QT_FEATURE_private_tests) add_subdirectory(qauthenticator) - - if(NOT MACOS) - add_subdirectory(qhostinfo) - endif() endif() diff --git a/tests/auto/network/kernel/kernel.pro b/tests/auto/network/kernel/kernel.pro index c13378cc02..c701a7fdc0 100644 --- a/tests/auto/network/kernel/kernel.pro +++ b/tests/auto/network/kernel/kernel.pro @@ -9,12 +9,12 @@ SUBDIRS=\ qnetworkinterface \ qnetworkdatagram \ qnetworkaddressentry \ - qhostaddress \ + qhostaddress -osx: SUBDIRS -= \ # QTBUG-41847 - qhostinfo \ +# QTBUG-41847 +osx: SUBDIRS -= qhostinfo !qtConfig(private_tests): SUBDIRS -= \ qauthenticator \ - qhostinfo \ + qhostinfo |