diff options
| author | Egor Nemtsev <enemtsev@luxoft.com> | 2020-01-15 15:17:45 +0300 |
|---|---|---|
| committer | Egor Nemtsev <enemtsev@luxoft.com> | 2020-01-16 08:38:12 +0000 |
| commit | fd8a23ceb3a31cc5f3bd51c5e01cba7f9d9b9917 (patch) | |
| tree | 5b4daa352d6fb5636aed999c93b3910253b3a066 /src/remotesettings | |
| parent | f2fd37abf8ceabf0017b2a09d0ae0ba6dcdd8647 (diff) | |
[android] fix remoteobjects dependency
- in Qt 5.14 multi arch was added to android build, libs should be included
with QT_ARCH suffix. Using QT += remoteobjects includes required lib with
suffix to APK
Change-Id: I97d4249121df6781d0054212fd018f6505b169e1
Reviewed-by: Grigorii Zimin <gzimin@luxoft.com>
Diffstat (limited to 'src/remotesettings')
| -rw-r--r-- | src/remotesettings/app/app.pro | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/remotesettings/app/app.pro b/src/remotesettings/app/app.pro index 3d8db60d..8bd7ec44 100644 --- a/src/remotesettings/app/app.pro +++ b/src/remotesettings/app/app.pro @@ -36,17 +36,12 @@ QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptun QML_IMPORT_PATH += $$BUILD_DIR/imports_shared_cpp android { + QT += remoteobjects + copydata.commands = $(COPY_DIR) $$[QT_INSTALL_PLUGINS]/qtivi $$BUILD_DIR/plugins first.depends = $(first) copydata - export(first.depends) - export(copydata.commands) QMAKE_EXTRA_TARGETS += first copydata -#This is used to tell the deployment tool to include these additional -#libs to the apk. This library (libQt5RemoteObjects) is not directly used by the -#app itself, but by the backend plugin. - ANDROID_EXTRA_LIBS = $$[QT_INSTALL_LIBS]/libQt5RemoteObjects.so - #In case we have some other than QML plugins to include to the apk, this is the #variable to use. In this case we use it to include the Qtivi backend plugin, #which is expected to be found under directory "qtivi". For this to work, the |