diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-09-11 06:59:40 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-09-11 07:34:11 +0000 |
| commit | e35af70d9888eb7f30846d62eb32e02dbd94b10f (patch) | |
| tree | 003516b4995d31efd358e6c59ee3ae820f3c55c4 | |
| parent | 90a4e8d3d00b6c946ddeb85b083cdaea458589a4 (diff) | |
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 <alexandru.croitor@qt.io>
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 4b2a1d379e..1d2113720d 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}")); |