From 8f4f1789e4c851a2351984269148c61fe34aee5d Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Mon, 13 Jul 2020 14:23:03 +0200 Subject: 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 Reviewed-by: BogDan Vatra --- src/3rdparty/gradle/gradle.pro | 2 ++ 1 file changed, 2 insertions(+) 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 = \ -- cgit v1.2.3