This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 6ac47cc8d31a370e27587b42deba46f52140c6da Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 07:30:39 2015 +0100 x2goclient.pro: work around another bug in qmake and copy icon "manually". --- debian/changelog | 1 + x2goclient.pro | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5751e39..d2c962f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -216,6 +216,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Fix references of resources in macbuild.sh to access files from TOP_DIR. - Work around a bug in qmake generating incorrect make rules for embedding the OS X app bundle Info.plist file. + - Work around another bug in qmake and copy icon "manually". -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index c4b75cb..9d5ca8a 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -196,12 +196,15 @@ QT += svg network ICON = $${PWD}/res/img/icons/x2go-mac.icns # Strictly speaking, this is a bug in qmake and we should neither need $${PWD} -# nor QMAKE_INFO_PLIST_OUT nor PRE_TARGETDEPS. +# nor QMAKE_INFO_PLIST_OUT nor PRE_TARGETDEPS nor QMAKE_POST_LINK. # Not defining the latter two will however lead to it being empty and no -# Info.plist file being created in the first place. Bummer. +# Info.plist file being created in the first place. +# The last command takes care of actually putting the icon in place - yet +# another bug in qmake. Bummer. QMAKE_INFO_PLIST = $${PWD}/res/Info.plist QMAKE_INFO_PLIST_OUT = $${TARGET}.app/Contents/Info.plist PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist +QMAKE_POST_LINK += /bin/cp -n $${ICON} $${OUT_PWD}/$${TARGET}.app/Contents/Resources/ plugin { DEFINES += CFGPLUGIN -- Alioth's /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git