aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kde.org>2019-05-02 11:32:47 +0300
committerBogDan Vatra <bogdan@kdab.com>2019-05-02 14:18:14 +0000
commit2a88460ace25208b3774ab0e32df3fa9d20452ea (patch)
tree6de8f098c9fed76737721860f30ae2ed137d7581
parent0d05d54b541a6ffc1d96ca0538670b5493b96a71 (diff)
Android: add Qt.android_support.extraLibs
extraLibs are needed to add OpenSSL support to Qt apps. Change-Id: Ib91f593c0be7d9a689fdc6c0537749353f3164eb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--doc/reference/modules/qt-android_support-module.qdoc9
-rw-r--r--share/qbs/module-providers/Qt/templates/android_support.qbs10
2 files changed, 19 insertions, 0 deletions
diff --git a/doc/reference/modules/qt-android_support-module.qdoc b/doc/reference/modules/qt-android_support-module.qdoc
index f7ec595e3..995f73ba5 100644
--- a/doc/reference/modules/qt-android_support-module.qdoc
+++ b/doc/reference/modules/qt-android_support-module.qdoc
@@ -77,6 +77,15 @@
*/
/*!
+ \qmlproperty stringList Qt.android_support::extraLibs
+
+ Additional libs to be packaged and loaded on start-up (mind the order).
+ Corresponds to qmake's ANDROID_EXTRA_LIBS.
+
+ \defaultvalue \c undefined
+*/
+
+/*!
\qmlproperty bool Qt.android_support::verboseAndroidDeployQt
Enable this property if you want verbose output from the
diff --git a/share/qbs/module-providers/Qt/templates/android_support.qbs b/share/qbs/module-providers/Qt/templates/android_support.qbs
index 43d9b52b4..c5f842a1f 100644
--- a/share/qbs/module-providers/Qt/templates/android_support.qbs
+++ b/share/qbs/module-providers/Qt/templates/android_support.qbs
@@ -10,6 +10,7 @@ Module {
property stringList extraPrefixDirs
property stringList deploymentDependencies // qmake: ANDROID_DEPLOYMENT_DEPENDENCIES
property stringList extraPlugins // qmake: ANDROID_EXTRA_PLUGINS
+ property stringList extraLibs // qmake: ANDROID_EXTRA_LIBS
property bool verboseAndroidDeployQt: false
property string _androidDeployQtFilePath: FileInfo.joinPaths(_qtInstallDir, "bin",
@@ -107,6 +108,15 @@ Module {
var extraPlugins = product.Qt.android_support.extraPlugins;
if (extraPlugins && extraPlugins.length > 0)
f.writeLine('"android-extra-plugins": "' + extraPlugins.join() + '",');
+ var extraLibs = product.Qt.android_support.extraLibs;
+ if (extraLibs && extraLibs.length > 0) {
+ for (var i = 0; i < extraLibs.length; ++i) {
+ if (!FileInfo.isAbsolutePath(extraLibs[i])) {
+ extraLibs[i] = FileInfo.joinPaths(product.sourceDirectory, extraLibs[i]);
+ }
+ }
+ f.writeLine('"android-extra-libs": "' + extraLibs.join() + '",');
+ }
var prefixDirs = product.Qt.android_support.extraPrefixDirs;
if (prefixDirs && prefixDirs.length > 0)
f.writeLine('"extraPrefixDirs": ' + JSON.stringify(prefixDirs) + ',');