Fixed in-source builds for custom QML extension plug-ins.

Check if the output directory is different from the source dir. If so,
do the copying magic (shadow build), otherwise skip it (in-source build).

Task-number: QTCREATORBUG-3034
Reviewed-by: Alessandro Portale
Reviewed-by: Oswald Buddenhagen

diff --git a/share/qtcreator/templates/wizards/qml-extension/project.pro b/share/qtcreator/templates/wizards/qml-extension/project.pro
index 8a5a9c4..94686ce 100644 (file)
--- a/share/qtcreator/templates/wizards/qml-extension/project.pro
+++ b/share/qtcreator/templates/wizards/qml-extension/project.pro
@@ -16,8 +16,10 @@ HEADERS += \
 
 OTHER_FILES = qmldir
 
-copy_qmldir.target = $$OUT_PWD/qmldir
-copy_qmldir.depends = $$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
+!equals(_PRO_FILE_PWD_, $$OUT_PWD) {
+    copy_qmldir.target = $$OUT_PWD/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
+}