diff options
| author | Heikkinen Miikka <miikka.heikkinen@digia.com> | 2013-05-22 09:49:28 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-05-22 10:12:28 +0300 |
| commit | abf0d5005e357dd2fe59ccf02412687f72e56cb5 (patch) | |
| tree | 00d421bf283728f936693d280b2469cb027d342c /tests/tests.pri | |
| parent | e2eb16a7c3b113365d1de6a9d5c04b7d31147432 (diff) | |
Fix qml application deployment for android
Change-Id: I5a693f3ca7d6110505f8e6d276f53825e1a5961b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests/tests.pri')
| -rw-r--r-- | tests/tests.pri | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/tests.pri b/tests/tests.pri index 85e07054..662cdcab 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -12,3 +12,23 @@ RCC_DIR = $$CHART_BUILD_DIR/tests/$$TARGET # staticlib config causes problems when building executables staticlib: CONFIG-=staticlib + +android { + # Workaround to fix android deployment, which seems to always look for target in + # OUT_PWD instead of DESTDIR. + QMAKE_POST_LINK += $$QMAKE_COPY $$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so + + contains(TARGET, qml.*) { + charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir + charts_qmldir.path = /assets/imports/QtCommercial/Chart + charts_qmlplugin.files = $$CHART_BUILD_QML_PLUGIN_DIR/libqtcommercialchartqml.so + charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH + INSTALLS += charts_qmldir charts_qmlplugin + } else:contains(TARGET, quick2.*) { + charts_qmldir.files = $$CHART_BUILD_QML2_PLUGIN_DIR/qmldir + charts_qmldir.path = /assets/qml/QtCommercial/Chart + charts_qmlplugin.files = $$CHART_BUILD_QML2_PLUGIN_DIR/libqtcommercialchartqml2.so + charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH + INSTALLS += charts_qmldir charts_qmlplugin + } +} |