forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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()) {
|
||||
|
||||
Reference in New Issue
Block a user