diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-27 01:00:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-27 01:00:50 +0200 |
| commit | 8bcecd86fac60475a7236787b4b89460fa89d612 (patch) | |
| tree | 947fc6b3b097c615e7cb2611c2df9f2fabdaac1c /src/corelib/corelib.pro | |
| parent | 7b3bdcbfe8a920c4c156e91324eb0b374533d42c (diff) | |
| parent | dd0cd711708f65c429f807f42456bff14404f9c0 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I182a639748760393f9e6b0724259201588aeaae3
Diffstat (limited to 'src/corelib/corelib.pro')
| -rw-r--r-- | src/corelib/corelib.pro | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index b4f301878d..eca888385b 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -99,6 +99,12 @@ cmake_umbrella_config_module_location_for_install.output = $$DESTDIR/cmake/insta cmake_umbrella_config_version_file.input = $$PWD/../../mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in cmake_umbrella_config_version_file.output = $$DESTDIR/cmake/Qt5/Qt5ConfigVersion.cmake +android { + cmake_android_support.input = $$PWD/Qt5AndroidSupport.cmake + cmake_android_support.output = $$DESTDIR/cmake/Qt5Core/Qt5AndroidSupport.cmake + cmake_android_support.CONFIG = verbatim +} + load(cmake_functions) defineTest(pathIsAbsolute) { @@ -144,6 +150,11 @@ QMAKE_SUBSTITUTES += \ cmake_extras_mkspec_dir \ cmake_extras_mkspec_dir_for_install +android { + QMAKE_SUBSTITUTES += cmake_android_support + ctest_qt5_module_files.files += $$cmake_android_support.output +} + ctest_qt5_module_files.files += $$ctest_macros_file.output $$cmake_extras_mkspec_dir_for_install.output ctest_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5Core |