From 4b15164be841d45b6bd6d7853d9dd23bcc350b94 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@Phils-TouchBar.local>
Date: Sun, 5 May 2024 14:34:27 +0100
Subject: [PATCH] Fix MacOS building

---
 wfmain.cpp | 2 +-
 wfview.pro | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/wfmain.cpp b/wfmain.cpp
index 206eae4..4eaa6f9 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -2033,7 +2033,7 @@ void wfmain::loadSettings()
             butt.backgroundOff.setNamedColor(settings->value("BackgroundOff", QColor(Qt::blue).name(QColor::HexArgb)).toString());
             butt.toggle = settings->value("Toggle", false).toBool();
             // PET add Linux as it stops Qt6 building FIXME
-#if (QT_VERSION > QT_VERSION_CHECK(6,0,0) && !defined(Q_OS_LINUX))
+#if (QT_VERSION > QT_VERSION_CHECK(6,0,0) && !defined(Q_OS_LINUX) && !defined(Q_OS_MACOS))
             if (settings->value("Icon",NULL) != NULL) {
                 butt.icon = new QImage(settings->value("Icon",NULL).value<QImage>());
                 butt.iconName = settings->value("IconName", "").toString();
diff --git a/wfview.pro b/wfview.pro
index 85663b9..0905562 100644
--- a/wfview.pro
+++ b/wfview.pro
@@ -90,13 +90,19 @@ macx:LIBS += -L/usr/local/lib -L/opt/local/lib
 
 macx:ICON = ../wfview/resources/wfview.icns
 win32:RC_ICONS = ../wfview/resources/wfview.ico
-macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
+macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
 macx:QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
 macx:MY_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS
 macx:MY_ENTITLEMENTS.value = ../wfview/resources/wfview.entitlements
 macx:QMAKE_MAC_XCODE_SETTINGS += MY_ENTITLEMENTS
 macx:QMAKE_INFO_PLIST = ../wfview/resources/Info.plist
 
+macx{
+    rigFiles.files = rigs
+    rigFiles.path = Contents/MacOS
+    QMAKE_BUNDLE_DATA += rigFiles
+}
+
 QMAKE_TARGET_BUNDLE_PREFIX = org.wfview
 
 !win32:DEFINES += HOST=\\\"`hostname`\\\" UNAME=\\\"`whoami`\\\"