summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2015-11-06 15:23:28 +0200
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2015-11-09 13:44:50 +0200
commit25fa07daf70b8b00cd6832a9e180dfa517da4b8b (patch)
tree45680e38819ef818e19a2253149aaf7a7fb2e7fe
parent3017f770cdb69726c81af0b783b52a25acf07acc (diff)
parente83790bebe2263c89f91239846ec31a9edbff7f1 (diff)
Merge branch 'develop'
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2.pro10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro
index d26a22b6..3f855a27 100644
--- a/src/datavisualizationqml2/datavisualizationqml2.pro
+++ b/src/datavisualizationqml2/datavisualizationqml2.pro
@@ -61,15 +61,5 @@ win32 {
QMAKE_TARGET_DESCRIPTION = "3D Data Visualization QML plugin for Qt."
}
-# Copy qmldir to DESTDIR so we can use the plugin directly from there in our examples
-# without having to do 'make install'.
-!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
-}
-
QML_FILES += \
$$PWD/plugins.qmltypes