diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2018-05-15 12:39:41 +0200 |
|---|---|---|
| committer | Vikas Pachdha <vikas.pachdha@qt.io> | 2018-05-16 06:37:57 +0000 |
| commit | 23ac1d18e1be8d898adf44dde745ba7c259beb3c (patch) | |
| tree | 1e8639f917c514bf24cba14731eb7f58e4445664 /src | |
| parent | f7895e272b4555ce1963790b9db1eea91bf359fb (diff) | |
Android: Fix the android include path
Task-number: QTCREATORBUG-20340
Change-Id: Ie1d7c15bf8b38b5141868149684e026ba9666630
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/android/androidtoolchain.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 9d3b8db27b..da75a80dee 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -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; |