diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-11-22 11:24:12 +0100 |
|---|---|---|
| committer | Daniel d'Andrada <daniel.dandrada@luxoft.com> | 2018-11-23 09:44:27 +0000 |
| commit | c23f978d0ed72f1b20d1ddd92dd6fe8f8c33cf64 (patch) | |
| tree | afa7576d4bf19cf851c62cc7369a9cc307fa996e /qmake-features | |
| parent | 60fe36350083df9c5b9e60e2aed9e479d143cd71 (diff) | |
Fix neptune3 on android
With the recent import path refactorings the deployment for android got
broken. This fixes the paths for the C++ plugins to let them be deployed
by androiddeployqt all QML only modules are deployed as normal assets
and are imported using appman.
To correctly deploy the controls plugin which has mixed content (QML + C++)
the qmlplugin.prf got improved to copy the needed files to the build
folder, which should also help to start neptune3 from the build-folder.
Change-Id: I6d875702d67c80a0a6f4ce8bde00a62eb1d8abcb
Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
Reviewed-by: Daniel d'Andrada <daniel.dandrada@luxoft.com>
Diffstat (limited to 'qmake-features')
| -rw-r--r-- | qmake-features/qmlplugin.prf | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/qmake-features/qmlplugin.prf b/qmake-features/qmlplugin.prf index f51bfdf2..4fada244 100644 --- a/qmake-features/qmlplugin.prf +++ b/qmake-features/qmlplugin.prf @@ -4,7 +4,7 @@ CONFIG += skip_target_version_ext TARGET = $$qtLibraryTarget($$TARGET) -android: DESTDIR = $$BUILD_DIR/imports_shared/cpp/$$replace(uri, \\., /) +android: DESTDIR = $$BUILD_DIR/imports_shared_cpp/shared/$$replace(uri, \\., /) else: DESTDIR = $$BUILD_DIR/imports_shared/shared/$$replace(uri, \\., /) OTHER_FILES = qmldir @@ -17,11 +17,29 @@ OTHER_FILES = qmldir PRE_TARGETDEPS += $$copy_qmldir.target } +!equals(_PRO_FILE_PWD_, $$OUT_PWD) { + for(extra_file, EXTRA_FILES) { + file = $$replace(_PRO_FILE_PWD_, /, $$QMAKE_DIR_SEP)$${QMAKE_DIR_SEP}$${extra_file} + target = $$replace(DESTDIR, /, $$QMAKE_DIR_SEP)$${QMAKE_DIR_SEP}$${extra_file} + copy_$${extra_file}.target = $$target + copy_$${extra_file}.depends = $$file + copy_$${extra_file}.commands = $(COPY_FILE) \"$$file\" \"$$target\" + QMAKE_EXTRA_TARGETS += copy_$${extra_file} + PRE_TARGETDEPS += $$target + } +} + +for(extra_file, EXTRA_FILES) { + extra_files_install.files += $${extra_file} + DISTFILES += $${extra_file} +} + include(../config.pri) qmldir.files = qmldir -android: installPath = $$INSTALL_PREFIX/imports_shared/cpp/$$replace(uri, \\., /) +android: installPath = $$INSTALL_PREFIX/imports_shared_cpp/shared/$$replace(uri, \\., /) else: installPath = $$INSTALL_PREFIX/neptune3/imports_shared/shared/$$replace(uri, \\., /) qmldir.path = $$installPath target.path = $$installPath -INSTALLS += target qmldir +extra_files_install.path = $$installPath +INSTALLS += target qmldir extra_files_install |