From 6d732dd8ba3c4c25226943b33bf5e051f48b7ba0 Mon Sep 17 00:00:00 2001 From: Gabriel Calero Date: Fri, 5 Jan 2018 19:45:02 -0300 Subject: [PATCH] Add missing Qt dependencies to gradle script --- android/app/build.gradle | 4 ---- android/build.gradle | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 343074047e..815a15e752 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,9 +1,5 @@ apply plugin: 'com.android.application' -ext.RELEASE_NUMBER = project.hasProperty('RELEASE_NUMBER') ? project.getProperty('RELEASE_NUMBER') : '0' -ext.RELEASE_TYPE = project.hasProperty('RELEASE_TYPE') ? project.getProperty('RELEASE_TYPE') : 'DEV' -ext.BUILD_BRANCH = project.hasProperty('BUILD_BRANCH') ? project.getProperty('BUILD_BRANCH') : '' - android { compileSdkVersion 26 defaultConfig { diff --git a/android/build.gradle b/android/build.gradle index d2e3a3a183..239d98f0bd 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -53,6 +53,8 @@ ext { 'Qt5WebSockets', 'Qt5Widgets', 'Qt5XmlPatterns', + 'Qt5Concurrent', + 'Qt5Svg', // Android specific 'Qt5AndroidExtras', 'Qt5WebView', @@ -502,6 +504,22 @@ task generateAssetsFileList() { } } +task copyInterfaceAssets() { + doLast { + def resourcesDir = new File("${appDir}/../../interface/resources") + def scriptsDir = new File("${appDir}/../../scripts") + def assetsDir = new File(appDir, 'src/main/assets') + copy { + from resourcesDir + into new File(assetsDir, "resources") + } + copy { + from scriptsDir + into new File(assetsDir, "scripts") + } + } +} + /* // FIXME derive the path from the gradle environment def toolchain = [