This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit bea6d89dca99dfca8ea5aae70f165d6769495be1 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 07:11:06 2015 +0100 x2goclient.pro: work around a bug in qmake generating incorrect make rules for embedding the OS X app bundle Info.plist file. --- debian/changelog | 2 ++ x2goclient.pro | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1cf4525..5751e39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -214,6 +214,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium appbundle and dmg file in macbuild.sh. - Move Info.plist to res/ and update reference in x2goclient.pro. - 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. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index 77ce345..c4b75cb 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -193,8 +193,15 @@ win32-* { CONFIG += static release } QT += svg network -ICON = res/img/icons/x2go-mac.icns -QMAKE_INFO_PLIST = res/Info.plist +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. +# Not defining the latter two will however lead to it being empty and no +# Info.plist file being created in the first place. Bummer. +QMAKE_INFO_PLIST = $${PWD}/res/Info.plist +QMAKE_INFO_PLIST_OUT = $${TARGET}.app/Contents/Info.plist +PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist plugin { DEFINES += CFGPLUGIN -- Alioth's /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git