summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@qt.io>2016-12-17 00:08:20 +0900
committerTasuku Suzuki <tasuku.suzuki@qt.io>2016-12-17 00:08:40 +0900
commit34b0702f10fc152356169079e4eb281f284346eb (patch)
treed1d460b421db463b2f1f503affa5968f45bbf518
parent5157ed0f5a3498cc45c3c04938a2b36f9b067625 (diff)
Copy icon and config file for wgt always
We have to do it regardless of shadow building Change-Id: I861077c76158c46afa4062bb1735a5265475b2df Signed-off-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
-rw-r--r--package/package.pro22
1 files changed, 10 insertions, 12 deletions
diff --git a/package/package.pro b/package/package.pro
index 3ee8fa3..7f2103c 100644
--- a/package/package.pro
+++ b/package/package.pro
@@ -1,19 +1,17 @@
DISTFILES = icon.svg config.xml
-!equals($$_PRO_FILE_PWD_, $$OUT_PWD) {
- copy_icon.target = $$OUT_PWD/root/icon.svg
- copy_icon.depends = $$_PRO_FILE_PWD_/icon.svg
- copy_icon.commands = $(COPY_FILE) \"$$replace(copy_icon.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_icon.target, /, $$QMAKE_DIR_SEP)\"
- QMAKE_EXTRA_TARGETS += copy_icon
- PRE_TARGETDEPS += $$copy_icon.target
+copy_icon.target = $$OUT_PWD/root/icon.svg
+copy_icon.depends = $$_PRO_FILE_PWD_/icon.svg
+copy_icon.commands = $(COPY_FILE) \"$$replace(copy_icon.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_icon.target, /, $$QMAKE_DIR_SEP)\"
+QMAKE_EXTRA_TARGETS += copy_icon
+PRE_TARGETDEPS += $$copy_icon.target
- copy_config.target = $$OUT_PWD/root/config.xml
- copy_config.depends = $$_PRO_FILE_PWD_/config.xml
- copy_config.commands = $(COPY_FILE) \"$$replace(copy_config.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_config.target, /, $$QMAKE_DIR_SEP)\"
- QMAKE_EXTRA_TARGETS += copy_config
- PRE_TARGETDEPS += $$copy_config.target
-}
+copy_config.target = $$OUT_PWD/root/config.xml
+copy_config.depends = $$_PRO_FILE_PWD_/config.xml
+copy_config.commands = $(COPY_FILE) \"$$replace(copy_config.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_config.target, /, $$QMAKE_DIR_SEP)\"
+QMAKE_EXTRA_TARGETS += copy_config
+PRE_TARGETDEPS += $$copy_config.target
wgt.target = package
wgt.commands = wgtpkg-pack -f -o hvac.wgt root