From e83790bebe2263c89f91239846ec31a9edbff7f1 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 6 Nov 2015 12:28:27 +0100 Subject: Fix debug-and-release build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Datavis 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: I1879fc5ff6303104392a66e54d5c278752a12655 Reviewed-by: Jędrzej Nowacki Reviewed-by: Miikka Heikkinen Reviewed-by: Tomi Korpipää --- src/datavisualizationqml2/datavisualizationqml2.pro | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/datavisualizationqml2/datavisualizationqml2.pro') 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 -- cgit v1.2.3