diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-05-02 18:49:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-05 18:03:35 +0200 |
| commit | 832ec4408369a9234ed967cd006ab3e4dc876bf3 (patch) | |
| tree | 05bea91bd63d5a6bbe7a3682eaed75819aa2b05a /examples/quick | |
| parent | eb6a978315f577689bd498516f79fda4ad14b3c3 (diff) | |
fix copying of qmldir file to build dir
Task-number: QTBUG-36252
Change-Id: Icbd956daf707105a5616d057c11b9aa1f55ff5d2
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'examples/quick')
| -rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro index 468c0a0d92..e88e8f670c 100644 --- 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) |