Merge branch 'master' of github.com:martinrotter/rssguard

This commit is contained in:
Martin Rotter 2023-01-05 09:44:58 +01:00
commit 2b247d2340

View File

@ -267,6 +267,12 @@ void FormMain::prepareMenus() {
if (QSysInfo::currentCpuArchitecture().contains(QSL("arm"), Qt::CaseSensitivity::CaseInsensitive)) {
qWarningNN << LOGSEC_GUI << "Disabling native menu bar.";
m_ui->m_menuBar->setNativeMenuBar(false);
#if defined(Q_OS_MACOS)
// This works around a macOS-only Qt crash.
// QTBUG: https://bugreports.qt.io/browse/QTBUG-102107
// TODO: Remove this workaround once the upstream bug gets addressed.
m_ui->m_menuBar->setCornerWidget(nullptr);
#endif
}
}