[X2Go-Commits] [x2goclient] 04/12: macbuild.sh: qmake never supported -config, it was always CONFIG(+)='something'.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit 847cfe7b3054b7e44a3704f8212bb4404c65b35e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Dec 1 20:20:05 2022 +0100

    macbuild.sh: qmake never supported -config, it was always CONFIG(+)='something'.
---
 debian/changelog | 2 ++
 macbuild.sh      | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b9d190..faea010 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -137,6 +137,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
     - handle_mxe.sh: rework, make most variables lowercase, change spacing,
       use proper if-else blocks, do not use special bash features for string
       comparison etc.
+    - macbuild.sh: qmake never supported -config, it was always
+      CONFIG(+)='something'.
   * debian/control:
     + Move to debian/control.in.
   * debian/control.in:
diff --git a/macbuild.sh b/macbuild.sh
index 1a5cb94..cc781b0 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -316,8 +316,7 @@ phase "Running lrelease"
 lrelease "${PROJECT}"
 
 phase "Running qmake"
-qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \
-      CONFIG+="${BUILD_ARCH}" \
+qmake CONFIG+="${BUILD_MODE} ${BUILD_ARCH}" -spec macx-g++ "${PROJECT}" \
       QMAKE_MAC_SDK="${SDK}" \
       QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
       OSX_STDLIB="${STDLIB}" \

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git