From 34b0702f10fc152356169079e4eb281f284346eb Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Sat, 17 Dec 2016 00:08:20 +0900 Subject: [PATCH] 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 --- package/package.pro | 22 ++++++++++------------ 1 file 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 -- 2.16.6