diff options
| author | Alex Richardson <Alexander.Richardson@cl.cam.ac.uk> | 2020-09-03 15:01:05 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-15 20:05:32 +0200 |
| commit | 44920e7fb272f49423c925555e8ae3bc38ffd8a4 (patch) | |
| tree | 35d318f26cbdc006f7eaf4ff993e3e497b3f25b3 /tests/auto/corelib/kernel | |
| parent | 93fc3afe71467ca6aeffa41d7a6f4a170f82b62e (diff) | |
CMake: Fix building with -DQT_FEATURE_gui=OFF
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ø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib/kernel')
| -rw-r--r-- | tests/auto/corelib/kernel/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/kernel.pro | 4 |
2 files changed, 5 insertions, 3 deletions
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 \ |