diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2017-03-01 18:40:57 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2017-04-11 06:17:20 +0000 |
| commit | 64e99958f358003092cdf455eec89c08cf3b6fd1 (patch) | |
| tree | 24a94c11cbafddeadb3ec88951332cfba293e677 | |
| parent | d8e6c1e55d311afb6a0e37cb4d54ad51dec221da (diff) | |
| download | qttools-64e99958f358003092cdf455eec89c08cf3b6fd1.tar.gz | |
Use gradle from Qt location
Because now we control everything we don't need to update Gradle's urls
Task-number: QTBUG-59237
Change-Id: Idfcd20a6d4bdd2b269bb5675ad9938bf403b67c5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit 26be57463c9a29b40c205b2f19aaf9ae79b6ab6a)
| -rw-r--r-- | src/androiddeployqt/main.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp index 6a218b7af..48efae233 100644 --- a/src/androiddeployqt/main.cpp +++ b/src/androiddeployqt/main.cpp @@ -943,7 +943,7 @@ bool copyAndroidTemplate(const Options &options, const QString &androidTemplate, bool copyGradleTemplate(const Options &options) { - QDir sourceDirectory(options.sdkPath + QLatin1String("/tools/templates/gradle/wrapper")); + QDir sourceDirectory(options.qtInstallDirectory + QLatin1String("/src/3rdparty/gradle")); if (!sourceDirectory.exists()) { fprintf(stderr, "Cannot find template directory %s\n", qPrintable(sourceDirectory.absolutePath())); return false; @@ -2416,18 +2416,6 @@ static bool mergeGradleProperties(const QString &path, GradleProperties properti return true; } -bool updateGradleDistributionUrl(const QString &path) { - // check if we are using gradle 2.x - GradleProperties gradleProperties = readGradleProperties(path); - QString distributionUrl = QString::fromLocal8Bit(gradleProperties["distributionUrl"]); - QRegExp re(QLatin1String(".*services.gradle.org/distributions/gradle-2..*.zip")); - if (!re.exactMatch(distributionUrl)) { - gradleProperties["distributionUrl"] = "https\\://services.gradle.org/distributions/gradle-2.2.1-all.zip"; - return mergeGradleProperties(path, gradleProperties); - } - return true; -} - bool buildGradleProject(const Options &options) { GradleProperties localProperties; @@ -2447,9 +2435,6 @@ bool buildGradleProject(const Options &options) if (!mergeGradleProperties(gradlePropertiesPath, gradleProperties)) return false; - if (!updateGradleDistributionUrl(options.outputDirectory + QLatin1String("gradle/wrapper/gradle-wrapper.properties"))) - return false; - #if defined(Q_OS_WIN32) QString gradlePath(options.outputDirectory + QLatin1String("gradlew.bat")); #else |