Merge branch 'master' of github.com:martinrotter/rssguard
This commit is contained in:
commit
2b247d2340
1 changed files with 6 additions and 0 deletions
|
@ -267,6 +267,12 @@ void FormMain::prepareMenus() {
|
||||||
if (QSysInfo::currentCpuArchitecture().contains(QSL("arm"), Qt::CaseSensitivity::CaseInsensitive)) {
|
if (QSysInfo::currentCpuArchitecture().contains(QSL("arm"), Qt::CaseSensitivity::CaseInsensitive)) {
|
||||||
qWarningNN << LOGSEC_GUI << "Disabling native menu bar.";
|
qWarningNN << LOGSEC_GUI << "Disabling native menu bar.";
|
||||||
m_ui->m_menuBar->setNativeMenuBar(false);
|
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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue