diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2020-01-16 16:00:26 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2020-01-17 09:37:17 +0000 |
| commit | dd8d367513df0ce893a1e00c5089bce6dfbc4ffb (patch) | |
| tree | e096af7a49253ee088d2714ecc2af75ea8cd21a4 /src/remotesettings | |
| parent | bb219457167a2cd753ccb72f4acfc11539c2594b (diff) | |
[android] Fix deployment of the qtivi plugins
Because of the new AAB of Qt for android, the deployment mechanism has
been changed and the plugin location is now also encoded into the file
name, similar to how it was done with QML plugins already before.
Using qt5LibraryTarget instead of qtLibraryTarget makes sure the prefix
is correct and the plugins are detected correctly by QtIvi.
Change-Id: I880cee19f59c6bdeb7c3c9d3bff01b9762707df0
Task-number: AUTOSUITE-1408
Reviewed-by: Egor Nemtsev <enemtsev@luxoft.com>
Diffstat (limited to 'src/remotesettings')
| -rw-r--r-- | src/remotesettings/app/app.pro | 16 | ||||
| -rw-r--r-- | src/remotesettings/backend/backend.pro | 2 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/remotesettings/app/app.pro b/src/remotesettings/app/app.pro index 8bd7ec44..c1e8737a 100644 --- a/src/remotesettings/app/app.pro +++ b/src/remotesettings/app/app.pro @@ -35,21 +35,7 @@ QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptun #needed for the android deployment to include additional qml plugins 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 - QMAKE_EXTRA_TARGETS += first copydata - -#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 -#built plugin has then to be found under "$$BUILD_DIR/plugins/qtivi/". -#There is a line in the backend plugin's .pro file that places the plugin under -#"$$BUILD_DIR/plugins/" when building for android - ANDROID_EXTRA_PLUGINS = $$BUILD_DIR/plugins/ -} +android: QT += remoteobjects HEADERS += \ client.h diff --git a/src/remotesettings/backend/backend.pro b/src/remotesettings/backend/backend.pro index 18d6ca26..689437fc 100644 --- a/src/remotesettings/backend/backend.pro +++ b/src/remotesettings/backend/backend.pro @@ -1,5 +1,5 @@ TEMPLATE=lib -TARGET = $$qtLibraryTarget(remotesettings_backend_qtro) +TARGET = $$qt5LibraryTarget(remotesettings_backend_qtro, "plugins/qtivi/") CONFIG += ivigenerator plugin QT_FOR_CONFIG += ivicore |