From e35af70d9888eb7f30846d62eb32e02dbd94b10f Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 11 Sep 2020 06:59:40 +0200 Subject: [PATCH] Android: Use c++_shared for STL as cxx_shared is not correct This fixes a parsing problem from CMake as it will state: "Invalid Android STL: cxx_shared." This amends 01b0d4f8f561328628051f14776d056a4bc023b6 Change-Id: I315d36eac889ba53d76055814c6b43a453e1e2f7 Reviewed-by: Alexandru Croitor --- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 4b2a1d379e8..1d2113720d5 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -171,7 +171,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Utils::Id id) 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( QString::fromLatin1("-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}"));