diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-01 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-01 01:00:10 +0200 |
| commit | 5ee1c86d10e2efbd4fc48c5af046a2e08cf925fd (patch) | |
| tree | aca0092605f88601fab50992f2a1b8de38cb839a /mkspecs/features | |
| parent | 0642444e7277a7fd8177f0a610e54f80bacc538e (diff) | |
| parent | 4d7271087e84096abd75fa806bea234daee0cd94 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I4505ec6fe17a1aa2c8d1e6576234d06a34eb9f99
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index fe9149b1c1..376a7ded5d 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -367,7 +367,7 @@ cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} # Other modules should either create proper tests in tests/auto/cmake or, as # a temporary measure, disable the generation of cmake files # with 'CONFIG -= create_cmake' -!equals(CMAKE_MODULE_TESTS, -) { +!internal_module:!equals(CMAKE_MODULE_TESTS, -) { isEmpty(CMAKE_MODULE_TESTS): CMAKE_MODULE_TESTS = $$MODULE_BASE_INDIR/tests/auto/cmake !exists($$CMAKE_MODULE_TESTS): \ error("Missing CMake tests. Either create tests in tests/auto/cmake," \ |