From a801e78fb8d1000bdcd0d47e24edffbf219650e8 2015-11-06 13:15:29
From: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Date: 2015-11-06 13:15:29
Subject: [PATCH] Fix debug-and-release build

Charts is part of the Qt release and there is no need to do magic hacks
to install the qmldir file.
This was supposed to help running examples separately, but we assume
that the lib is shipped with Qt proper.

The problem was that the qmldir file would be simultaneously copied into
the same location twice which will fail on Windows.

Change-Id: I4d765c18367f7985c7dbfadbc7ddae78ce24f398
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

---

diff --git a/src/chartsqml2/chartsqml2.pro b/src/chartsqml2/chartsqml2.pro
index 4dd8295..5df0194 100644
--- a/src/chartsqml2/chartsqml2.pro
+++ b/src/chartsqml2/chartsqml2.pro
@@ -68,15 +68,5 @@ win32 {
     QMAKE_TARGET_DESCRIPTION = "Charts 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