diff options
author | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:50:03 +0200 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:51:20 +0200 |
commit | 07aba602fc82ac31684988f8e8e22521d2b3c982 (patch) | |
tree | 7ae1da139e8661bf157f996fe71844031d2995f4 /examples/examples.pri | |
parent | cf0cf6ca67aec8ae480bb705443ea17f5ab9f9e2 (diff) | |
parent | ea0442bc81ae034d22c5742b6075dee993fdd54d (diff) |
Merge branch 'develop' into mergebranch
Conflicts:
examples/qmlbars/qml/qmlbars/main.qml
examples/qmlscatter/qml/qmlscatter/main.qml
examples/qmlsurface/qml/qmlsurface/main.qml
src/datavisualization/data/qitemmodelbardatamapping.cpp
src/datavisualization/data/qitemmodelscatterdatamapping.cpp
src/datavisualization/data/qitemmodelsurfacedatamapping.cpp
src/datavisualization/engine/drawer.cpp
Change-Id: I731ebdb2cc5cee8f2cb32becee96d1fc1b3e5de1
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 } } |