From 581b7c08a0a9e7922ac418051c4884ae04bbd893 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 1 Mar 2021 06:40:36 +0100 Subject: [PATCH] Possible f i x for #370. --- resources/desktop/com.github.rssguard.appdata.xml | 2 +- resources/scripts/7za | 2 +- src/librssguard/gui/dialogs/formmain.cpp | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index d3688bc9e..3b94581fd 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none diff --git a/resources/scripts/7za b/resources/scripts/7za index 9c10723bf..47f412575 160000 --- a/resources/scripts/7za +++ b/resources/scripts/7za @@ -1 +1 @@ -Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749 +Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9 diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp index 1c1cafb44..92839b334 100755 --- a/src/librssguard/gui/dialogs/formmain.cpp +++ b/src/librssguard/gui/dialogs/formmain.cpp @@ -231,6 +231,11 @@ void FormMain::prepareMenus() { m_ui->m_actionSwitchMainMenu->setVisible(false); m_ui->m_actionFullscreen->setVisible(false); #endif + + if (QSysInfo::currentCpuArchitecture().contains(QSL("arm"), Qt::CaseSensitivity::CaseInsensitive)) { + qWarningNN << LOGSEC_GUI << "Disabling native menu bar."; + m_ui->m_menuBar->setNativeMenuBar(false); + } } void FormMain::switchFullscreenMode() {