feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Use c++_shared for STL as cxx_shared is not correct

Browse Source 
This fixes a parsing problem from CMake as it will state:
"Invalid Android STL: cxx_shared." This amends
01b0d4f8f5

Change-Id: I315d36eac889ba53d76055814c6b43a453e1e2f7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Andy Shaw
2020-09-11 06:59:40 +02:00
parent 90a4e8d3d0
commit e35af70d98
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -171,7 +171,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Utils::Id id)
QString::fromLatin1("-DANDROID_SDK:PATH=%1").arg(sdkLocation.toString())); QString::fromLatin1("-DANDROID_SDK:PATH=%1").arg(sdkLocation.toString()));
} }
initialArgs.append(QString::fromLatin1("-DANDROID_STL:STRING=cxx_shared")); initialArgs.append(QString::fromLatin1("-DANDROID_STL:STRING=c++_shared"));
initialArgs.append( initialArgs.append(
QString::fromLatin1("-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}")); QString::fromLatin1("-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}"));