summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-02-26 08:22:42 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-02-26 08:26:16 +0200
commit419bc4159e41c1a303c4d6be23efbe7a0f3fc791 (patch)
treed7307587ef52d22c5a24336c3f3a24224e211337
parentff815c03c42d3bf583905e0f878c0ecf17298fc0 (diff)
Don't copy qmldir in android or ios
Change-Id: Ia2d05ad2a19bd37681facc17fc98ee14993ea639 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2.pro13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro
index 7cfc19ba..df6c647d 100644
--- a/src/datavisualizationqml2/datavisualizationqml2.pro
+++ b/src/datavisualizationqml2/datavisualizationqml2.pro
@@ -49,9 +49,10 @@ load(qml_plugin)
# Copy qmldir to DESTDIR so we can use the plugin directly from there in our examples
# without having to do 'make install'.
-android: copy_qmldir.target = $$OUT_PWD/qmldir
-else: copy_qmldir.target = $$DESTDIR/qmldir
-copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
-copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
-QMAKE_EXTRA_TARGETS += copy_qmldir
-PRE_TARGETDEPS += $$copy_qmldir.target
+!android:!ios {
+ copy_qmldir.target = $$DESTDIR/qmldir
+ copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
+ copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
+ QMAKE_EXTRA_TARGETS += copy_qmldir
+ PRE_TARGETDEPS += $$copy_qmldir.target
+}