From 0d177053b9406e2fb21802d23f2b2cdc0f974377 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 12 Feb 2020 10:24:49 +0100 Subject: Regenerate projects one last time before merge Change-Id: Ia24cf56b79ca6dacd370a7e397024e9b663e0167 Reviewed-by: Liang Qi Reviewed-by: Simon Hausmann --- tests/auto/network/access/hpack/CMakeLists.txt | 5 ++--- tests/auto/network/access/hsts/CMakeLists.txt | 5 ++--- tests/auto/network/access/http2/CMakeLists.txt | 5 ++--- tests/auto/network/access/qftp/CMakeLists.txt | 3 +-- tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt | 4 +--- tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt | 4 +--- tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt | 5 ++--- tests/auto/network/access/qnetworkreply/test/CMakeLists.txt | 4 +--- 8 files changed, 12 insertions(+), 23 deletions(-) (limited to 'tests/auto/network/access') diff --git a/tests/auto/network/access/hpack/CMakeLists.txt b/tests/auto/network/access/hpack/CMakeLists.txt index 531246ecf0..e1c5c1a469 100644 --- a/tests/auto/network/access/hpack/CMakeLists.txt +++ b/tests/auto/network/access/hpack/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_hpack SOURCES tst_hpack.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:hpack.pro:: diff --git a/tests/auto/network/access/hsts/CMakeLists.txt b/tests/auto/network/access/hsts/CMakeLists.txt index f2d09a6395..804ebedf61 100644 --- a/tests/auto/network/access/hsts/CMakeLists.txt +++ b/tests/auto/network/access/hsts/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qhsts SOURCES tst_qhsts.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:hsts.pro:: diff --git a/tests/auto/network/access/http2/CMakeLists.txt b/tests/auto/network/access/http2/CMakeLists.txt index 082da570e7..51c7c18eac 100644 --- a/tests/auto/network/access/http2/CMakeLists.txt +++ b/tests/auto/network/access/http2/CMakeLists.txt @@ -13,9 +13,8 @@ add_qt_test(tst_http2 SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" INCLUDE_DIRECTORIES ../../../../shared - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate ) diff --git a/tests/auto/network/access/qftp/CMakeLists.txt b/tests/auto/network/access/qftp/CMakeLists.txt index 4c706febdd..9887e1eea6 100644 --- a/tests/auto/network/access/qftp/CMakeLists.txt +++ b/tests/auto/network/access/qftp/CMakeLists.txt @@ -11,10 +11,9 @@ endif() add_qt_test(tst_qftp SOURCES tst_qftp.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:qftp.pro:: diff --git a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt index b1b2059952..6ab8876c82 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt @@ -11,11 +11,9 @@ endif() add_qt_test(tst_qhttpnetworkconnection SOURCES tst_qhttpnetworkconnection.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qhttpnetworkconnection.pro:: diff --git a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt index c381ec7b3b..8c68a18da6 100644 --- a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt @@ -11,11 +11,9 @@ endif() add_qt_test(tst_qhttpnetworkreply SOURCES tst_qhttpnetworkreply.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qhttpnetworkreply.pro:: diff --git a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt index a9296cf3f0..929388a10a 100644 --- a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt @@ -10,10 +10,9 @@ list(APPEND test_data "parser.json") add_qt_test(tst_qnetworkcookiejar SOURCES tst_qnetworkcookiejar.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt index 97d0da3d34..48759572de 100644 --- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt @@ -23,11 +23,9 @@ add_qt_test(tst_qnetworkreply ../tst_qnetworkreply.cpp INCLUDE_DIRECTORIES ../../../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network TESTDATA ${test_data} ) -- cgit v1.2.3