diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 09:52:38 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 10:13:55 +0300 |
| commit | defd066b46329783c10ace4e67fddc4a2a65bf4c (patch) | |
| tree | 05a4ec7b5bdb60dd233a8a407fdbee47311ca2cc /examples | |
| parent | 594fc157103ea419091425e5315cb6a82ef82654 (diff) | |
Android copy issue fixed
Task-number: QTRD-2355
Change-Id: I325b8c70711687a06c5d7ac4cda6418cc7dbcdc5
Change-Id: I325b8c70711687a06c5d7ac4cda6418cc7dbcdc5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pri | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/examples/examples.pri b/examples/examples.pri index 82692204..dc4add12 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -27,11 +27,12 @@ contains(TARGET, qml.*) { make_qmldir_target = \"$$replace(make_qmldir_path, /, $$QMAKE_DIR_SEP)\" system($$QMAKE_MKDIR $$make_qmldir_target) } - copy_qmldir_examples.target = $$make_qmldir_path/qmldir - copy_qmldir_examples.depends = $$_PRO_FILE_PWD_/../../src/$$lib_name/qmldir - copy_qmldir_examples.commands = $(COPY_FILE) \"$$replace(copy_qmldir_examples.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir_examples.target, /, $$QMAKE_DIR_SEP)\" - QMAKE_EXTRA_TARGETS += copy_qmldir_examples - PRE_TARGETDEPS += $$copy_qmldir_examples.target + copy_qmldir.target = $$make_qmldir_path/qmldir + copy_qmldir.depends = $$_PRO_FILE_PWD_/../../src/$$lib_name/qmldir + copy_qmldir_formatted = \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\" + copy_qmldir.commands = $(COPY_FILE) $$copy_qmldir_formatted + QMAKE_EXTRA_TARGETS += copy_qmldir + PRE_TARGETDEPS += $$copy_qmldir.target win32 { CONFIG(debug, release|debug) { @@ -58,12 +59,15 @@ contains(TARGET, qml.*) { } copy_lib.target = $$make_qmldir_path/$$src_lib copy_lib.depends = $$OUT_PWD/../../src/$$lib_name/$$src_dir/$$src_lib - copy_lib.commands = $(COPY_FILE) \"$$replace(copy_lib.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_lib.target, /, $$QMAKE_DIR_SEP)\" + copy_lib_formatted = \"$$replace(copy_lib.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_lib.target, /, $$QMAKE_DIR_SEP)\" + copy_lib.commands = $(COPY_FILE) $$copy_lib_formatted QMAKE_EXTRA_TARGETS += copy_lib PRE_TARGETDEPS += $$copy_lib.target android { - android_qmldir.files = $$copy_qmldir_examples.target + system($$QMAKE_COPY $$copy_qmldir_formatted) + system($$QMAKE_COPY $$copy_lib_formatted) + android_qmldir.files = $$copy_qmldir.target android_qmldir.path = /assets/qml/$$uri_replaced android_qmlplugin.files = $$copy_lib.target android_qmlplugin.path = $$target.path |