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

Merge remote-tracking branch 'origin/4.6' into 4.7

Browse Source 
Conflicts:
	src/plugins/qnx/qnxplugin.cpp

Change-Id: I8ede5fa9c8daf3001e41fcba7cbee68edb9db3a6
This commit is contained in:
Eike Ziller
2018-05-16 10:09:15 +02:00
parent 5cd1bb6f73 23ac1d18e1
commit ccefc5cf47
10 changed files with 54 additions and 7 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();
// 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;
stdcppPath.appendPath("sources/cxx-stl/gnu-libstdc++/" + clangVersion);
Utils::FileName includePath = stdcppPath;