From 71aa96d0c3c80d4e450f8ed04c07f9a7e42ed059 Mon Sep 17 00:00:00 2001
From: kkostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Mon, 18 Oct 2021 11:58:41 -0400
Subject: [PATCH] qt-client: build for macOS
Change-Id: I7e44b91981702be83f4dd848c513d16d3dcc9f88
---
build.py | 8 +++++++-
scripts/install.sh | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/build.py b/build.py
index ef31ebbb..cdb4f9d9 100755
--- a/build.py
+++ b/build.py
@@ -394,7 +394,12 @@ def run_install(args):
environ['CMAKE_PREFIX_PATH'] = proc.stdout.rstrip("\n")
environ['CONFIGURE_FLAGS'] = '--without-dbus'
- install_args += ("-c", "client-macosx")
+ if args.qt is None:
+ install_args += ("-c", "client-macosx")
+ else:
+ install_args += ("-c", "client-qt")
+ install_args += ("-q", args.qtver)
+ install_args += ("-Q", args.qt)
else:
if args.distribution in ZYPPER_BASED_DISTROS:
# fix jsoncpp pkg-config bug, remove when jsoncpp package bumped
@@ -592,6 +597,7 @@ def validate_args(parsed_args):
if parsed_args.qt is not None:
supported_qt_distros = [
'guix',
+ OSX_DISTRIBUTION_NAME,
WIN32_DISTRIBUTION_NAME
] + APT_BASED_DISTROS + DNF_BASED_DISTROS + PACMAN_BASED_DISTROS
diff --git a/scripts/install.sh b/scripts/install.sh
index 89bab04a..8d75b6f4 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -130,6 +130,8 @@ if [ "${client}" = "client-qt" ] && [ -z "$qt6path" ]; then
sys_qt6ver=$(qmake -v)
elif command -v qmake-qt6 &> /dev/null; then
sys_qt6ver=$(qmake-qt6 -v) # Fedora
+ elif command -v qmake6 &> /dev/null; then
+ sys_qt6ver=$(qmake6 -v) # macOS
else
echo "No valid Qt found"; exit 1;
fi
--
GitLab