diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-07-13 14:23:03 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-07-16 09:08:52 +0200 |
| commit | 8f4f1789e4c851a2351984269148c61fe34aee5d (patch) | |
| tree | 88db39efbf8b718122d6bdbfb77244a554552df1 /src/3rdparty | |
| parent | 3da9cff84599c613a440e320e649dd957e89ecfb (diff) | |
Android: Don't treat gradle.pro as a buildable target
When installing gradle it can conflict as it will treat it as the target
and therefore install it as an executable although it is a directory
inside this one. As this does not build anything but is really an
installation target, we can mark it as aux template and change the target
name to avoid any conflicts with the existing directory.
Pick-to: 5.15
Task-number: QTBUG-80938
Change-Id: I000ee57521818b6d4d30d770362ff4700846e576
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/gradle/gradle.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/gradle/gradle.pro b/src/3rdparty/gradle/gradle.pro index bad41e3468..ffc2237044 100644 --- a/src/3rdparty/gradle/gradle.pro +++ b/src/3rdparty/gradle/gradle.pro @@ -1,3 +1,5 @@ +TEMPLATE = aux +TARGET = dummy # Avoid a conflict with the existing gradle directory CONFIG -= qt android_install gradle.files = \ |