diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-18 18:29:03 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-23 14:12:10 +0000 |
| commit | 014b90f780a0e208d30772f5da4b7a715e7ba78b (patch) | |
| tree | de9ef3bff4c5b21617788cadee869250f1aa3691 /src/plugins/cmakeprojectmanager | |
| parent | efa6f2ee4be8c5b85f0436e459aee7d62bdc1f13 (diff) | |
Android: Fix CMake parsing for Qt 6.0.0 kits
Qt for Android 6.0 with CMake requires QT_HOST_PATH to be provided for
CMake to properly parse and configure the project.
Fixes: QTCREATORBUG-24660
Change-Id: Id5d77f900698ef4d19ec8e37b14e4e3234c74ea4
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 001e575bf43..47e93c19da2 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -176,6 +176,11 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Utils::Id id) initialArgs.append( QString::fromLatin1("-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}")); + + if (qt->qtVersion() >= QtSupport::QtVersionNumber{6, 0, 0}) { + initialArgs.append( + QString::fromLatin1("-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}")); + } } if (info.buildDirectory.isEmpty()) { |