1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Don't treat gradle.pro as a buildable target

Browse Source 
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.

Task-number: QTBUG-80938
Change-Id: I000ee57521818b6d4d30d770362ff4700846e576
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
(cherry picked from commit 8f4f1789e4c851a2351984269148c61fe34aee5d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Andy Shaw 2020-07-13 14:23:03 +02:00 committed by Qt Cherry-pick Bot
parent b296a7e6e6
commit 4075fd43fc
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/gradle/gradle.pro vendored
View File

@ -1,3 +1,5 @@
TEMPLATE = aux
TARGET = dummy # Avoid a conflict with the existing gradle directory
CONFIG -= qt android_install
gradle.files = \