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

Android: Fix the android include path

Browse Source 
Task-number: QTCREATORBUG-20340
Change-Id: Ie1d7c15bf8b38b5141868149684e026ba9666630
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Vikas Pachdha
2018-05-15 12:39:41 +02:00
parent f7895e272b
commit 23ac1d18e1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidtoolchain.cpp
View File

@@ -116,7 +116,9 @@ static void addSystemHeaderPaths(QList<ProjectExplorer::HeaderPath> &paths,
const Utils::FileName ndkPath = AndroidConfigurations::currentConfig().ndkLocation(); const Utils::FileName ndkPath = AndroidConfigurations::currentConfig().ndkLocation();
// Get short version (for example 4.9) // Get short version (for example 4.9)
const QString clangVersion = version.left(version.lastIndexOf('.')); auto versionNumber = QVersionNumber::fromString(version);
const QString clangVersion = QString("%1.%2")
.arg(versionNumber.majorVersion()).arg(versionNumber.minorVersion());
Utils::FileName stdcppPath = ndkPath; Utils::FileName stdcppPath = ndkPath;
stdcppPath.appendPath("sources/cxx-stl/gnu-libstdc++/" + clangVersion); stdcppPath.appendPath("sources/cxx-stl/gnu-libstdc++/" + clangVersion);
Utils::FileName includePath = stdcppPath; Utils::FileName includePath = stdcppPath;