From 44920e7fb272f49423c925555e8ae3bc38ffd8a4 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Thu, 3 Sep 2020 15:01:05 +0100 Subject: CMake: Fix building with -DQT_FEATURE_gui=OFF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some CMake files currently assume that QtGui is always enabled and we get a configure-time failure without these changes. Task-number: QTBUG-86053 Change-Id: I28e32c180c32221f32519017bac6b518a19d5983 Reviewed-by: Tor Arne Vestbø Reviewed-by: Qt CI Bot --- .../io/qprocess/testForwardingHelper/.prev_CMakeLists.txt | 13 +++++++++++++ .../corelib/io/qprocess/testForwardingHelper/CMakeLists.txt | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt (limited to 'tests/auto/corelib/io/qprocess/testForwardingHelper') diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt new file mode 100644 index 0000000000..9197f96e10 --- /dev/null +++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from testForwardingHelper.pro. + +##################################################################### +## testForwardingHelper Binary: +##################################################################### + +qt_add_executable(testForwardingHelper + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt index 9197f96e10..0024b006ed 100644 --- a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt @@ -8,6 +8,6 @@ qt_add_executable(testForwardingHelper OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp - PUBLIC_LIBRARIES - Qt::Gui + #PUBLIC_LIBRARIES # special case remove + #Qt::Gui # special case remove ) -- cgit v1.2.3