diff options
| author | Friedrich W. H. Kossebau <kossebau@kde.org> | 2016-05-03 17:00:24 +0200 |
|---|---|---|
| committer | Friedrich W. H. Kossebau <kossebau@kde.org> | 2016-05-03 17:00:24 +0200 |
| commit | e0cfec7848ba63190957e107c7ef32dbe0119c42 (patch) | |
| tree | bbe700543d38547fbe427cf56deed6867e508be8 /toolchain/deployment-file.json.in | |
| parent | d914de956197c72e4df55b7b09ebae1222c5ddcf (diff) | |
| download | extra-cmake-modules-e0cfec7848ba63190957e107c7ef32dbe0119c42.tar.gz extra-cmake-modules-e0cfec7848ba63190957e107c7ef32dbe0119c42.tar.bz2 | |
Android deployment: support projects without things in share or lib/qmlv5.22.0-rc1v5.22.0
Just setting the field android-extra-plugins to an empty string resulted
in androiddeployqt complaining about
"External resource does not exist or not a correct directory!"
so the field is completely left out now if no plugin data dirs are found.
For consistency the same is done with the android-extra-libs field.
REVIEW: 127700
BUG: 362578
Thanks apol for review
Diffstat (limited to 'toolchain/deployment-file.json.in')
| -rw-r--r-- | toolchain/deployment-file.json.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index 9367bc1b..e691e431 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -8,8 +8,8 @@ "ndk-host": "@_HOST@", "target-architecture": "@ANDROID_ABI@", "application-binary": "@EXECUTABLE_DESTINATION_PATH@", - "android-extra-libs": "##EXTRALIBS##", - "android-extra-plugins": "@CMAKE_INSTALL_PREFIX@/share,@CMAKE_INSTALL_PREFIX@/lib/qml", + ##EXTRALIBS## + ##EXTRAPLUGINS## "android-package-source-directory": "@ANDROID_APK_DIR@", "sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@" } |