diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2013-12-16 09:43:02 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-16 10:33:49 +0200 |
| commit | 9a1e8f34990afaf3c0fb6d44e936f5f03b9a3636 (patch) | |
| tree | 40a87d3c738354cd8c88c936e17b93a2edc03c1b /examples/examples.pri | |
| parent | 642e3fb0d91cca401ebba0221f46bc32fccc1e74 (diff) | |
Remove static linking from android build
Task-number: QTRD-2641
Change-Id: Ic136f43edb3a118aef6570b2dcb71532563a292c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Diffstat (limited to 'examples/examples.pri')
| -rw-r--r-- | examples/examples.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/examples/examples.pri b/examples/examples.pri index bfce7b0d..ca91aad0 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -22,6 +22,7 @@ QT += datavisualization contains(TARGET, qml.*) { uri = QtDataVisualization lib_name = datavisualizationqml2 + vis_lib_name = DataVisualization uri_replaced = $$replace(uri, \\., $$QMAKE_DIR_SEP) make_qmldir_path = $$DESTDIR/$$uri_replaced @@ -57,6 +58,7 @@ contains(TARGET, qml.*) { } else { # linux, android src_lib = lib$${lib_name}.so + vis_src_lib = lib$${vis_lib_name}.so } } copy_lib.target = $$make_qmldir_path/$$src_lib @@ -73,6 +75,9 @@ contains(TARGET, qml.*) { android_qmldir.path = /assets/qml/$$uri_replaced android_qmlplugin.files = $$copy_lib.target android_qmlplugin.path = $$target.path + vis_lib_dir = $$OUT_PWD/../../lib/$$vis_src_lib + vis_lib_formatted = $$replace(vis_lib_dir, /, $$QMAKE_DIR_SEP) + ANDROID_EXTRA_LIBS = $$vis_lib_formatted INSTALLS += android_qmldir android_qmlplugin } } |