kopia lustrzana https://gitlab.com/eliggett/wfview
Fix MacOS building
rodzic
838d0d197a
commit
4b15164be8
|
@ -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();
|
||||
|
|
|
@ -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`\\\"
|
||||
|
|
Ładowanie…
Reference in New Issue