diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-06-28 07:38:21 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-06-28 07:38:59 +0300 |
| commit | ce9e92777d2408ee4e161a4c8f3f8dd32f99b90e (patch) | |
| tree | c5f0315d7aa8a238c3b6a035fc84a797feda4e4a /examples/examples.pri | |
| parent | f676523970ec8202760530588daf1ea6d212120c (diff) | |
Android QML fixes
Change-Id: I1de27d553fdfc83267a801108a3b3457f2e85224
Change-Id: I1de27d553fdfc83267a801108a3b3457f2e85224
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples/examples.pri')
| -rw-r--r-- | examples/examples.pri | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/examples/examples.pri b/examples/examples.pri index 906f7d27..48d2f29a 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -50,6 +50,7 @@ contains(TARGET, qml.*) { src_lib = lib$${lib_name}.dylib } } else { + # linux, android src_lib = lib$${lib_name}.so } } @@ -58,14 +59,12 @@ contains(TARGET, qml.*) { copy_lib.commands = $(COPY_FILE) \"$$replace(copy_lib.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_lib.target, /, $$QMAKE_DIR_SEP)\" QMAKE_EXTRA_TARGETS += copy_lib PRE_TARGETDEPS += $$copy_lib.target -} -#android { -# 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 -# } -#} + android { + android_qmldir.files = $$copy_qmldir_examples.target + android_qmldir.path = /assets/imports/$$make_qmldir_target + android_qmlplugin.files = $$copy_lib.target + android_qmlplugin.path = $$target.path + INSTALLS += android_qmldir android_qmlplugin + } +} |