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 --- tests/auto/corelib/kernel/CMakeLists.txt | 4 ++-- tests/auto/corelib/kernel/kernel.pro | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/auto/corelib/kernel') diff --git a/tests/auto/corelib/kernel/CMakeLists.txt b/tests/auto/corelib/kernel/CMakeLists.txt index 154cc8e766..85d80e7a3d 100644 --- a/tests/auto/corelib/kernel/CMakeLists.txt +++ b/tests/auto/corelib/kernel/CMakeLists.txt @@ -10,19 +10,19 @@ add_subdirectory(qmetaobject) add_subdirectory(qmetaobjectbuilder) add_subdirectory(qmetamethod) add_subdirectory(qmetaproperty) -add_subdirectory(qmetatype) add_subdirectory(qmetaenum) add_subdirectory(qpointer) add_subdirectory(qsignalblocker) add_subdirectory(qsignalmapper) add_subdirectory(qtimer) add_subdirectory(qtranslator) -add_subdirectory(qvariant) if(TARGET Qt::Network) add_subdirectory(qeventloop) endif() if(TARGET Qt::Gui) + add_subdirectory(qmetatype) add_subdirectory(qmimedata) + add_subdirectory(qvariant) endif() if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT) add_subdirectory(qobject) diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro index ba39070933..627407b0e4 100644 --- a/tests/auto/corelib/kernel/kernel.pro +++ b/tests/auto/corelib/kernel/kernel.pro @@ -28,7 +28,9 @@ SUBDIRS=\ qproperty !qtHaveModule(gui): SUBDIRS -= \ - qmimedata + qmimedata \ + qvariant \ + qmetatype !qtHaveModule(network): SUBDIRS -= \ qeventloop \ -- cgit v1.2.3