From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Sun, 18 Dec 2016 12:06:26 +0000 (+0000)
Subject: Merge "Copy icon and config file for wgt always"
X-Git-Tag: 3.0.0~5
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=45a90600c28111cdf0a358390c0082d6785d7f6a;hp=34869d07cacf6b0a4eebb0bc0d3f29027c0e6d9d;p=apps%2Fhvac.git

Merge "Copy icon and config file for wgt always"
---

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