diff options
author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-07-04 14:48:32 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-01 13:38:21 +0000 |
commit | 9e96c384261ca1329d3143295d013701eb85b186 (patch) | |
tree | f3c8cf74866174925ca748fd58c4b3c6759823d4 /tests/auto/corelib | |
parent | b26b1455d75709a53f50e1d3d41c384f8e90b576 (diff) |
Properly convert default QT directive
If unset QT by default has value: "core gui". This patch adds this
behavior by pre-defining the value in the root scope.
qmimedata CMakeList.txt was re-generated.
Change-Id: Ib8b6064bc46c72d829e0077d09f21bbfb494e137
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r-- | tests/auto/corelib/kernel/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qmimedata/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/corelib/kernel/CMakeLists.txt b/tests/auto/corelib/kernel/CMakeLists.txt index 4abddd700f..511e4f39db 100644 --- a/tests/auto/corelib/kernel/CMakeLists.txt +++ b/tests/auto/corelib/kernel/CMakeLists.txt @@ -15,7 +15,7 @@ add_subdirectory(qmetaproperty) # add_subdirectory(qmetatype) add_subdirectory(qmetaenum) if(NOT ((NOT TARGET Qt::Gui))) - # add_subdirectory(qmimedata) + add_subdirectory(qmimedata) endif() if(NOT ((ANDROID OR APPLE_UIKIT) OR (NOT TARGET Qt::Network))) # add_subdirectory(qobject) diff --git a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt index dd1e049209..7b373d6e6a 100644 --- a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt @@ -7,6 +7,8 @@ add_qt_test(tst_qmimedata SOURCES tst_qmimedata.cpp + PUBLIC_LIBRARIES + Qt::Gui ) #### Keys ignored in scope 1:.:.:qmimedata.pro:<TRUE>: |