diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-11-06 12:28:27 +0100 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2015-11-06 13:15:38 +0000 |
| commit | e83790bebe2263c89f91239846ec31a9edbff7f1 (patch) | |
| tree | 45680e38819ef818e19a2253149aaf7a7fb2e7fe | |
| parent | 105faffbcba19e90545afcf6d9292c5dd2c7ac94 (diff) | |
Fix debug-and-release build
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 <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| -rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2.pro | 10 |
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 |