fix copying of qmldir file to build dir

Task-number: QTBUG-36252
Change-Id: Icbd956daf707105a5616d057c11b9aa1f55ff5d2
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

diff --git a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
index 468c0a0..e88e8f6 100644 (file)
--- a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
@@ -20,14 +20,6 @@ SOURCES += \
 
 OTHER_FILES += qmldir
 
-copyfile = $$PWD/qmldir
-copydest = $$DESTDIR
-
-# On Windows, use backslashes as directory separators
-equals(QMAKE_HOST.os, Windows) {
-    copyfile ~= s,/,\\,g
-    copydest ~= s,/,\\,g
-}
-
 # Copy the qmldir file to the same folder as the plugin binary
-QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$copyfile) $$quote($$copydest) $$escape_expand(\\n\\t)
+QMAKE_POST_LINK += $$QMAKE_COPY $$shell_quote($$shell_path($$PWD/qmldir)) \
+                                $$shell_quote($$shell_path($$DESTDIR)) $$escape_expand(\\n\\t)