diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2017-03-22 13:45:20 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2017-03-27 08:00:42 +0000 |
| commit | 48c17a1e07e29e93e0b23ad6a64d457835497ae6 (patch) | |
| tree | 362684ff73766031066e202b1d425d028096537e | |
| parent | c73bcd32a82f674929583a17f13c9d2bc696a356 (diff) | |
| download | qt-creator-48c17a1e07e29e93e0b23ad6a64d457835497ae6.tar.gz | |
Update only old gradle distributionUrl
Task-number: QTCREATORBUG-17814
Task-number: QTCREATORBUG-17672
Change-Id: I658e8edec5c231a30ef4e99bae5d15cb6f6497f5
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 0b8762f24d..0459355b04 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -546,8 +546,8 @@ bool AndroidManager::updateGradleProperties(ProjectExplorer::Target *target) if (wrapperProps.exists()) { GradleProperties wrapperProperties = readGradleProperties(wrapperProps.toString()); QString distributionUrl = QString::fromLocal8Bit(wrapperProperties["distributionUrl"]); - QRegExp re(QLatin1String(".*services.gradle.org/distributions/gradle-2..*.zip")); - if (!re.exactMatch(distributionUrl)) { + // Update only old gradle distributionUrl + if (distributionUrl.endsWith(QLatin1String("distributions/gradle-1.12-all.zip"))) { wrapperProperties["distributionUrl"] = "https\\://services.gradle.org/distributions/gradle-2.2.1-all.zip"; mergeGradleProperties(wrapperProps.toString(), wrapperProperties); } |