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/other | |
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/other')
-rw-r--r-- | tests/auto/other/android/.prev_CMakeLists.txt | 19 | ||||
-rw-r--r-- | tests/auto/other/networkselftest/.prev_CMakeLists.txt | 16 | ||||
-rw-r--r-- | tests/auto/other/networkselftest/CMakeLists.txt | 5 |
3 files changed, 39 insertions, 1 deletions
diff --git a/tests/auto/other/android/.prev_CMakeLists.txt b/tests/auto/other/android/.prev_CMakeLists.txt new file mode 100644 index 0000000000..d58103679b --- /dev/null +++ b/tests/auto/other/android/.prev_CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from android.pro. + +##################################################################### +## tst_android Test: +##################################################################### + +qt_internal_add_test(tst_android + SOURCES + tst_android.cpp +) + +if(ANDROID) + set_property(TARGET tst_android APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/testdata + ) +endif() + +#### Keys ignored in scope 1:.:.:android.pro:<TRUE>: +# DISTFILES = "testdata/assets/test.txt" diff --git a/tests/auto/other/networkselftest/.prev_CMakeLists.txt b/tests/auto/other/networkselftest/.prev_CMakeLists.txt new file mode 100644 index 0000000000..c1e1b6518b --- /dev/null +++ b/tests/auto/other/networkselftest/.prev_CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from networkselftest.pro. + +##################################################################### +## tst_networkselftest Test: +##################################################################### + +qt_internal_add_test(tst_networkselftest + SOURCES + tst_networkselftest.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Network +) + +#### Keys ignored in scope 1:.:.:networkselftest.pro:<TRUE>: +# QT_TEST_SERVER_LIST = "cyrus" "vsftpd" "apache2" "ftp-proxy" "danted" "squid" "echo" diff --git a/tests/auto/other/networkselftest/CMakeLists.txt b/tests/auto/other/networkselftest/CMakeLists.txt index 7ccbbcdbb1..547e4afd7e 100644 --- a/tests/auto/other/networkselftest/CMakeLists.txt +++ b/tests/auto/other/networkselftest/CMakeLists.txt @@ -10,5 +10,8 @@ qt_internal_add_test(tst_networkselftest PUBLIC_LIBRARIES Qt::CorePrivate Qt::Network - QT_TEST_SERVER_LIST "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "cyrus" "echo" + QT_TEST_SERVER_LIST "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "cyrus" "echo" # special case ) + +#### Keys ignored in scope 1:.:.:networkselftest.pro:<TRUE>: +# QT_TEST_SERVER_LIST = "cyrus" "vsftpd" "apache2" "ftp-proxy" "danted" "squid" "echo" |