diff options
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 0459355b04..69e43e178c 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -60,6 +60,7 @@ #include <QMessageBox> #include <QApplication> #include <QDomDocument> +#include <QVersionNumber> namespace { const QLatin1String AndroidManifestName("AndroidManifest.xml"); @@ -565,16 +566,16 @@ bool AndroidManager::updateGradleProperties(ProjectExplorer::Target *target) gradleProperties["buildDir"] = ".build"; gradleProperties["androidCompileSdkVersion"] = buildTargetSDK(target).split(QLatin1Char('-')).last().toLocal8Bit(); if (gradleProperties["androidBuildToolsVersion"].isEmpty()) { - QString maxVersion; + QVersionNumber maxVersion; QDir buildToolsDir(AndroidConfigurations::currentConfig().sdkLocation().appendPath(QLatin1String("build-tools")).toString()); foreach (const QFileInfo &file, buildToolsDir.entryList(QDir::Dirs|QDir::NoDotAndDotDot)) { - QString ver(file.fileName()); + QVersionNumber ver = QVersionNumber::fromString(file.fileName()); if (maxVersion < ver) maxVersion = ver; } - if (maxVersion.isEmpty()) + if (maxVersion.isNull()) return false; - gradleProperties["androidBuildToolsVersion"] = maxVersion.toLocal8Bit(); + gradleProperties["androidBuildToolsVersion"] = maxVersion.toString().toLocal8Bit(); } return mergeGradleProperties(gradlePropertiesPath, gradleProperties); } |