diff options
author | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2017-03-23 16:55:59 +0100 |
---|---|---|
committer | Alistair Adams <alistair.adams@qt.io> | 2017-03-23 17:07:45 +0000 |
commit | a4b46cdb7a6b4123a341857ff71a47332479acea (patch) | |
tree | 3a9d2646905ca0cabf397401ac62e8a533143d16 | |
parent | a857a031614806125250d017f4dfa41c4331c083 (diff) |
Fix windows build
Change-Id: I8539c8d857e98fbe65dd89b91dd84e8bfc2bb6f7
Task-number: QTAUTO-299
Reviewed-by: Alistair Adams <alistair.adams@qt.io>
-rw-r--r-- | plugins/comtqci18ndemo/comtqci18ndemo.pro | 6 | ||||
-rw-r--r-- | plugins/datasource/datasource.pro | 6 | ||||
-rw-r--r-- | plugins/screenmanager/screenmanager.pro | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/plugins/comtqci18ndemo/comtqci18ndemo.pro b/plugins/comtqci18ndemo/comtqci18ndemo.pro index 3f4034f..d71de15 100644 --- a/plugins/comtqci18ndemo/comtqci18ndemo.pro +++ b/plugins/comtqci18ndemo/comtqci18ndemo.pro @@ -16,9 +16,9 @@ HEADERS += \ OTHER_FILES = qmldir !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)\" + copy_qmldir.target = $$replace(OUT_PWD, /, $$QMAKE_DIR_SEP)$${QMAKE_DIR_SEP}qmldir + copy_qmldir.depends = $$replace(_PRO_FILE_PWD_, /, $$QMAKE_DIR_SEP)$${QMAKE_DIR_SEP}qmldir + copy_qmldir.commands = $(COPY_FILE) \"$$copy_qmldir.depends\" \"$$copy_qmldir.target\" QMAKE_EXTRA_TARGETS += copy_qmldir PRE_TARGETDEPS += $$copy_qmldir.target } diff --git a/plugins/datasource/datasource.pro b/plugins/datasource/datasource.pro index 2db0949..4074c65 100644 --- a/plugins/datasource/datasource.pro +++ b/plugins/datasource/datasource.pro @@ -28,9 +28,9 @@ isEmpty(INSTALL_PREFIX) { } !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)\" + copy_qmldir.target = $$replace(OUT_PWD, /, $$QMAKE_DIR_SEP)$${QMAKE_DIR_SEP}qmldir + copy_qmldir.depends = $$replace(_PRO_FILE_PWD_, /, $$QMAKE_DIR_SEP)$${QMAKE_DIR_SEP}qmldir + copy_qmldir.commands = $(COPY_FILE) \"$$copy_qmldir.depends\" \"$$copy_qmldir.target\" QMAKE_EXTRA_TARGETS += copy_qmldir PRE_TARGETDEPS += $$copy_qmldir.target } diff --git a/plugins/screenmanager/screenmanager.pro b/plugins/screenmanager/screenmanager.pro index 00073fc..783e4ea 100644 --- a/plugins/screenmanager/screenmanager.pro +++ b/plugins/screenmanager/screenmanager.pro @@ -16,9 +16,9 @@ HEADERS += \ OTHER_FILES = qmldir !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)\" + copy_qmldir.target = $$replace(OUT_PWD, /, $$QMAKE_DIR_SEP)$${QMAKE_DIR_SEP}qmldir + copy_qmldir.depends = $$replace(_PRO_FILE_PWD_, /, $$QMAKE_DIR_SEP)$${QMAKE_DIR_SEP}qmldir + copy_qmldir.commands = $(COPY_FILE) \"$$copy_qmldir.depends\" \"$$copy_qmldir.target\" QMAKE_EXTRA_TARGETS += copy_qmldir PRE_TARGETDEPS += $$copy_qmldir.target } |