summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-04-01 12:12:10 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-04-15 20:38:44 +0200
commitd437a0bfca8f96dfd39c5872fd9479f2b7c4e61e (patch)
tree8c91e1f67b6d68b00f2b3b464561c7a9560cc65d
parent92d351089bf7e285c9800342ff72205c04984f6c (diff)
Remove Qt dependency from some test helper executables
pro2cmake did not take into account the QT -= qt bit of the .pro files. Fixes: QTBUG-91676 Change-Id: If1373ee966312e4246490bd7389d75be9fa739cb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt22
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt10
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt8
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt8
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt41
-rw-r--r--tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt11
-rw-r--r--tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt9
-rw-r--r--tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt10
-rw-r--r--tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt10
-rw-r--r--tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt10
19 files changed, 25 insertions, 204 deletions
diff --git a/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt
index 24f231982e..c9baab6cfc 100644
--- a/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from testExitCodes.pro.
-
#####################################################################
## testExitCodes Binary:
#####################################################################
-qt_internal_add_executable(testExitCodes
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(testExitCodes main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt
index f13f2f6b03..80b0001a39 100644
--- a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from testForwardingHelper.pro.
-
#####################################################################
## testForwardingHelper Binary:
#####################################################################
-qt_internal_add_executable(testForwardingHelper
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(testForwardingHelper main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt
index 1afc662a2c..230148ba22 100644
--- a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from testProcessCrash.pro.
-
#####################################################################
## testProcessCrash Binary:
#####################################################################
-qt_internal_add_executable(testProcessCrash
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(testProcessCrash main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt
index 55dce67f8a..24e4e8f58c 100644
--- a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from testProcessDeadWhileReading.pro.
-
#####################################################################
## testProcessDeadWhileReading Binary:
#####################################################################
-qt_internal_add_executable(testProcessDeadWhileReading
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(testProcessDeadWhileReading main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt
index c3cc35db60..6de59f67fe 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from testProcessEOF.pro.
-
#####################################################################
## testProcessEOF Binary:
#####################################################################
-qt_internal_add_executable(testProcessEOF
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(testProcessEOF main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt
index 128f35538b..55b9537fe1 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from testProcessEcho.pro.
-
#####################################################################
## testProcessEcho Binary:
#####################################################################
-qt_internal_add_executable(testProcessEcho
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(testProcessEcho main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt
index 4b3fb585f4..b805dc2d85 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from testProcessEcho2.pro.
-
#####################################################################
## testProcessEcho2 Binary:
#####################################################################
-qt_internal_add_executable(testProcessEcho2
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(testProcessEcho2 main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt
index 0b852a90ce..dc1d262462 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from testProcessEcho3.pro.
-
#####################################################################
## testProcessEcho3 Binary:
#####################################################################
-qt_internal_add_executable(testProcessEcho3
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(testProcessEcho3 main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt
index f96c8a4fa5..3cc5e3641d 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt
@@ -1,24 +1,6 @@
-# Generated from testProcessEchoGui.pro.
-
#####################################################################
## testProcessEchoGui Binary:
#####################################################################
-qt_internal_add_executable(testProcessEchoGui
- GUI # special case
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- DEFINES
- QT_DISABLE_DEPRECATED_BEFORE=0
- PUBLIC_LIBRARIES
- Qt::Gui
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(testProcessEchoGui CONDITION WIN32
- SOURCES
- main_win.cpp
- PUBLIC_LIBRARIES
- user32
-)
+add_executable(testProcessEchoGui WIN32 main_win.cpp)
+target_link_libraries(testProcessEchoGui PRIVATE user32)
diff --git a/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt
index fe48627b7c..ec725b67ca 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from testProcessEnvironment.pro.
-
#####################################################################
## testProcessEnvironment Binary:
#####################################################################
-qt_internal_add_executable(testProcessEnvironment
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(testProcessEnvironment main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt
index 3e8443c2a5..2c63be7ce9 100644
--- a/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from testProcessHang.pro.
-
#####################################################################
## testProcessHang Binary:
#####################################################################
-qt_internal_add_executable(testProcessHang
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(testProcessHang main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt
index 1726e1861b..10bbf3840d 100644
--- a/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt
@@ -1,11 +1,5 @@
-# Generated from testProcessNormal.pro.
-
#####################################################################
## testProcessNormal Binary:
#####################################################################
-qt_internal_add_executable(testProcessNormal
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
-)
+add_executable(testProcessNormal main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt
index 2a6d016f48..cc621d62f6 100644
--- a/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt
@@ -1,11 +1,5 @@
-# Generated from testProcessOutput.pro.
-
#####################################################################
## testProcessOutput Binary:
#####################################################################
-qt_internal_add_executable(testProcessOutput
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
-)
+add_executable(testProcessOutput main.cpp)
diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt
index fd2b38ef2f..0d2fff73c8 100644
--- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt
@@ -1,42 +1,7 @@
-# Generated from nospace.pro.
+add_executable(nospace main.cpp)
-#####################################################################
-## nospace Binary:
-#####################################################################
-
-qt_internal_add_executable(nospace
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- DEFINES
- QT_DISABLE_DEPRECATED_BEFORE=0
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
-
-# special case begin
-qt_internal_add_executable(onespace
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- DEFINES
- QT_DISABLE_DEPRECATED_BEFORE=0
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(onespace main.cpp)
set_target_properties(onespace PROPERTIES OUTPUT_NAME "one space")
-qt_internal_add_executable(twospaces
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- DEFINES
- QT_DISABLE_DEPRECATED_BEFORE=0
- #PUBLIC_LIBRARIES # special case remove
- #Qt::Gui # special case remove
-)
+add_executable(twospaces main.cpp)
set_target_properties(twospaces PROPERTIES OUTPUT_NAME "two space s")
-# special case end
-
-#### Keys ignored in scope 1:.:.:nospace.pro:<TRUE>:
-# OBJECTS_DIR = "$${OBJECTS_DIR}-nospace"
diff --git a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt
index 6b55c40f94..a68d434f52 100644
--- a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt
@@ -1,13 +1,6 @@
-# Generated from testSetNamedPipeHandleState.pro.
-
#####################################################################
## testSetNamedPipeHandleState Binary:
#####################################################################
-qt_internal_add_executable(testSetNamedPipeHandleState
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- PUBLIC_LIBRARIES
- Qt::Gui
-)
+add_executable(testSetNamedPipeHandleState main.cpp)
+target_link_libraries(testSetNamedPipeHandleState PRIVATE kernel32.lib)
diff --git a/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt
index ab78f9acdb..f6088e1032 100644
--- a/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt
@@ -1,15 +1,8 @@
-# Generated from testSoftExit.pro.
-
#####################################################################
## testSoftExit Binary:
#####################################################################
-qt_internal_add_executable(testSoftExit
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
-)
-
-## Scopes:
-#####################################################################
+add_executable(testSoftExit)
qt_internal_extend_target(testSoftExit CONDITION WIN32
SOURCES
diff --git a/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt
index e59ad51d6e..28107c9009 100644
--- a/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt
@@ -1,11 +1,7 @@
-# Generated from testSpaceInName.pro.
-
#####################################################################
## testSpaceInName Binary:
#####################################################################
-qt_internal_add_executable(testSpaceInName
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../test Space In Name"
- SOURCES
- main.cpp
-)
+add_executable(testSpaceInName main.cpp)
+set_property(TARGET testSpaceInName PROPERTY
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../test Space In Name")
diff --git a/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt
index 87a5e14fc3..b395ebf1a4 100644
--- a/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt
+++ b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from write-read-write.pro.
-
#####################################################################
## write-read-write Binary:
#####################################################################
-qt_internal_add_executable(write-read-write
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- PUBLIC_LIBRARIES
- Qt::Gui
-)
+add_executable(write-read-write main.cpp)
diff --git a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt
index 02c50f7df2..896435b27b 100644
--- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt
@@ -1,13 +1,5 @@
-# Generated from testProcessLoopback.pro.
-
#####################################################################
## testProcessLoopback Binary:
#####################################################################
-qt_internal_add_benchmark(testProcessLoopback
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
- SOURCES
- main.cpp
- PUBLIC_LIBRARIES
- Qt::Gui
-)
+add_executable(testProcessLoopback main.cpp)