summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-08-14 15:52:13 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-08-18 20:24:43 +0200
commit18cb90cd31bb7b48899232ed953f40dffcac6f09 (patch)
tree8978bd9afbbacd569b17c39cc93d9e2d940a739d /src/3rdparty
parent57b928a1a5d98adc8c4ac0b1a241d87cbc7c43c3 (diff)
Android: Copy required gradle files in non-prefix shadow builds
This fixes running 'make apk' in a qmake android project, when using a shadow non-prefix build. An implementation detail is that COPIES can't take both files and directories as values, so we split them into two steps. Task-number: QTBUG-85399 Change-Id: I7373d6b7aede6e33096cb9718c679fa5e5dc1703 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/gradle/gradle.pro14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/3rdparty/gradle/gradle.pro b/src/3rdparty/gradle/gradle.pro
index ffc2237044..1ff0db2017 100644
--- a/src/3rdparty/gradle/gradle.pro
+++ b/src/3rdparty/gradle/gradle.pro
@@ -2,14 +2,20 @@ TEMPLATE = aux
TARGET = dummy # Avoid a conflict with the existing gradle directory
CONFIG -= qt android_install
-gradle.files = \
+gradle_files.files = \
$$PWD/gradlew \
- $$PWD/gradlew.bat \
+ $$PWD/gradlew.bat
+gradle_dirs.files = \
$$PWD/gradle
-gradle.path = $$[QT_INSTALL_PREFIX]/src/3rdparty/gradle
+gradle_files.path = $$[QT_INSTALL_PREFIX]/src/3rdparty/gradle
+gradle_dirs.path = $${gradle_files.path}
-INSTALLS += gradle
+INSTALLS += gradle_files gradle_dirs
+!prefix_build:!equals(OUT_PWD, $$PWD) {
+ # For COPIES to work, files and directory entries need to be separate objects.
+ COPIES += gradle_files gradle_dirs
+}
!prefix_build:!equals(OUT_PWD, $$PWD) {
RETURN = $$escape_expand(\\n\\t)