configure.ac | 2 +-
vcl/unx/kf5/KF5SalInstance.cxx | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 60f9897228affd127bdfdddc04024c743e5c6fbe
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Wed May 24 03:00:07 2023 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed May 24 03:00:07 2023 +0200
Release version 7.3.7.4 for both Windows and Linux
Change-Id: Ie27002d0390aecf1fbe8ec88d4edfd411a569196
diff --git a/configure.ac b/configure.ac
index 5bb52272cdac..17f2ffc196e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[7.3.7.3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.7.4],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit 76e2d1f70143bbd65785ad325f1f0cd93ab0196a
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Wed May 24 02:52:16 2023 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed May 24 02:58:40 2023 +0200
Disable global menubar for Unity
There seems to be a number of problems, on older Qt5.5:
* https://bugreports.qt.io/browse/QTBUG-58723
* https://bugs.launchpad.net/ubuntu/+source/bamf/+bug/1532226
So instead of workarounds, let's just avoid the feature here.
Change-Id: Icec0b399ecb5a65ca3350acd4f4a59f3fe3bf089
diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx
index 1bf479a4e73e..1fb5e1efc229 100644
--- a/vcl/unx/kf5/KF5SalInstance.cxx
+++ b/vcl/unx/kf5/KF5SalInstance.cxx
@@ -77,6 +77,9 @@ VCLPLUG_KF5_PUBLIC SalInstance* create_SalInstance()
std::vector<FreeableCStr> aFakeArgvFreeable;
QtInstance::AllocFakeCmdlineArgs(pFakeArgv, pFakeArgc, aFakeArgvFreeable);
+ // disable global menubar, which is affected by QTBUG-58723
+ QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
+
std::unique_ptr<QApplication> pQApp
= QtInstance::CreateQApplication(*pFakeArgc, pFakeArgv.get());
