[X2Go-Commits] [x2goclient] 03/03: x2goclient.pro: move OS X-specific stuff from general section to macx section.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit f4e0c64a99bf3b106e64968210d7b528a05dfe45
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Mar 5 16:23:43 2015 +0100

    x2goclient.pro: move OS X-specific stuff from general section to macx section.
---
 debian/changelog |    2 ++
 x2goclient.pro   |   22 +++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ffa0d70..e2419a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -170,6 +170,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
       + Reorder sections so that they match x2goclient.pro.
       + Adapt to new directory structure.
       + Various whitespace fixes.
+    - Move OS X-specific stuff from general section to macx section in
+      x2goclient.pro.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 19 Feb 2015 13:25:28 +0100
 
diff --git a/x2goclient.pro b/x2goclient.pro
index 4c2cdd4..122122a 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -190,6 +190,17 @@ macx {
   !isEmpty(OSX_STDLIB) {
     QMAKE_CXXFLAGS += --stdlib=$${OSX_STDLIB}
   }
+
+  # Strictly speaking, this is a bug in qmake and we should neither need $${PWD}
+  # 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.
+  # The last command takes care of actually putting the icon in place - yet
+  # another bug in qmake. Bummer.
+  QMAKE_INFO_PLIST = $${PWD}/res/osxbundle/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/
 }
 win32-* {
   message("building $$TARGET for windows without ldap and cups")
@@ -199,17 +210,6 @@ win32-* {
 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_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.
-# The last command takes care of actually putting the icon in place - yet
-# another bug in qmake. Bummer.
-QMAKE_INFO_PLIST = $${PWD}/res/osxbundle/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/
-
 QMAKE_CXXFLAGS_DEBUG -= -g
 QMAKE_CXXFLAGS_DEBUG += -O2 -g3 -ggdb3 -gdwarf-4
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git