d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 03:00:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix macOS apple silicon build

Browse source
This commit is contained in:
Nicolas Werner 2024-01-09 03:05:00 +01:00
parent 066c9f1593
commit 7b2d04cdd8
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main.cpp
View file

@ -19,7 +19,9 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QTranslator> #include <QTranslator>
#ifdef Q_OS_UNIX // in theory we can enable this everywhere, but the header is missing on some of our CI systems and
// it is too much effort to install.
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
#include <QtGui/qpa/qplatformwindow_p.h> #include <QtGui/qpa/qplatformwindow_p.h>
#endif #endif
@ -157,7 +159,6 @@ main(int argc, char *argv[])
QCoreApplication::setApplicationName(QStringLiteral("nheko")); QCoreApplication::setApplicationName(QStringLiteral("nheko"));
QCoreApplication::setApplicationVersion(nheko::version); QCoreApplication::setApplicationVersion(nheko::version);
QCoreApplication::setOrganizationName(QStringLiteral("nheko")); QCoreApplication::setOrganizationName(QStringLiteral("nheko"));
QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
// Disable the qml disk cache by default to prevent crashes on updates. See // Disable the qml disk cache by default to prevent crashes on updates. See
// https://github.com/Nheko-Reborn/nheko/issues/1383 // https://github.com/Nheko-Reborn/nheko/issues/1383
@ -167,7 +168,7 @@ main(int argc, char *argv[])
// this needs to be after setting the application name. Or how would we find our settings // this needs to be after setting the application name. Or how would we find our settings
// file then? // file then?
#if !defined(Q_OS_MACOS) #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
if (qgetenv("QT_SCALE_FACTOR").size() == 0) { if (qgetenv("QT_SCALE_FACTOR").size() == 0) {
float factor = utils::scaleFactor(); float factor = utils::scaleFactor();
@ -253,7 +254,7 @@ main(int argc, char *argv[])
if (!singleapp.isPrimaryInstance()) { if (!singleapp.isPrimaryInstance()) {
auto token = qgetenv("XDG_ACTIVATION_TOKEN"); auto token = qgetenv("XDG_ACTIVATION_TOKEN");
#ifdef Q_OS_UNIX #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
// getting a valid activation token on wayland is a bit of a pain, it works most reliably // getting a valid activation token on wayland is a bit of a pain, it works most reliably
// when you have an actual window, that has the focus... // when you have an actual window, that has the focus...
auto waylandApp = app.nativeInterface<QNativeInterface::QWaylandApplication>(); auto waylandApp = app.nativeInterface<QNativeInterface::QWaylandApplication>();