diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 23:27:47 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 23:29:51 +0100 |
| commit | c53ee1f054fee2d6092c5e24b5b6b131dbd0457b (patch) | |
| tree | ffdc87c81c72b545602c7380bbde3f0ab5c499e0 /tests/auto/network/socket | |
| parent | 60feaae1967aca5c7b1b0f6cb732962ddd1b2115 (diff) | |
| parent | 0d177053b9406e2fb21802d23f2b2cdc0f974377 (diff) | |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Conflicts:
tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
Hopefully final merge from wip/cmake, and then all cmake changes
should target dev directly.
Change-Id: I29b04c9b0284e97334877c77a32ffdf887dbf95b
Diffstat (limited to 'tests/auto/network/socket')
5 files changed, 5 insertions, 15 deletions
diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt index bb681d9e2f..1dece78966 100644 --- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_platformsocketengine tst_platformsocketengine.cpp INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/network - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:platformsocketengine.pro:<TRUE>: diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt index 8dfa61c5ac..6aeec0a983 100644 --- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_qhttpsocketengine tst_qhttpsocketengine.cpp INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/network - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qhttpsocketengine.pro:<TRUE>: diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt index 41a958a36e..fd58b931e6 100644 --- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_qsocks5socketengine tst_qsocks5socketengine.cpp INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/network - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qsocks5socketengine.pro:<TRUE>: diff --git a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt index 238c6b9931..61b8d25736 100644 --- a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt @@ -7,11 +7,9 @@ add_qt_test(tst_qtcpsocket SOURCES ../tst_qtcpsocket.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) ## Scopes: diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt index 9523830a15..57fafe7a04 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -7,11 +7,9 @@ add_qt_test(tst_qtcpsocket SOURCES ../tst_qtcpsocket.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) ## Scopes: |