Merge remote-tracking branch 'origin/5.8' into 5.9

Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8

1 files changed, 23 insertions, 0 deletions

diff --git a/src/3rdparty/gradle/gradle.pro b/src/3rdparty/gradle/gradle.pro
new file mode 100644
index 0000000000..bad41e3468
--- /dev/null
+++ b/src/3rdparty/gradle/gradle.pro
@@ -0,0 +1,23 @@
+CONFIG -= qt android_install
+
+gradle.files = \
+    $$PWD/gradlew \
+    $$PWD/gradlew.bat \
+    $$PWD/gradle
+
+gradle.path = $$[QT_INSTALL_PREFIX]/src/3rdparty/gradle
+
+INSTALLS += gradle
+
+!prefix_build:!equals(OUT_PWD, $$PWD) {
+    RETURN = $$escape_expand(\\n\\t)
+    equals(QMAKE_HOST.os, Windows) {
+        RETURN = $$escape_expand(\\r\\n\\t)
+    }
+    OUT_PATH = $$shell_path($$OUT_PWD)
+
+    QMAKE_POST_LINK += \
+        $${QMAKE_COPY} $$shell_path($$PWD/gradlew) $$OUT_PATH $$RETURN \
+        $${QMAKE_COPY} $$shell_path($$PWD/gradlew.bat) $$OUT_PATH $$RETURN \
+        $${QMAKE_COPY_DIR} $$shell_path($$PWD/gradle) $$OUT_PATH
+}