shell/Library_kf5be.mk | 1 + shell/source/backends/kf5be/kf5backend.cxx | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-)
New commits: commit f6180e3e8725687605027815b4e878dc83b300b0 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Feb 2 16:21:43 2022 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Feb 3 17:16:12 2022 +0100 rhbz#2047319 drop the SolarMutex before QApplication::init() https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/24#note_383915 reproducible with with qt5-qtwayland-5.15.2-17.fc35.x86_64 and export OOO_FORCE_DESKTOP=plasma5 export SAL_USE_VCLPLUGIN=gtk3 Change-Id: Icdf6b8709865c723c266e6400169b33639a1b0e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129373 Reviewed-by: Michael Weghorn <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/shell/Library_kf5be.mk b/shell/Library_kf5be.mk index 61262c567516..26ed1b35dd22 100644 --- a/shell/Library_kf5be.mk +++ b/shell/Library_kf5be.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Library_use_libraries,kf5be1,\ cppu \ cppuhelper \ sal \ + vcl \ )) $(eval $(call gb_Library_set_componentfile,kf5be1,shell/source/backends/kf5be/kf5be1,services)) diff --git a/shell/source/backends/kf5be/kf5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx index e9e10e60fd27..2b41414c54cd 100644 --- a/shell/source/backends/kf5be/kf5backend.cxx +++ b/shell/source/backends/kf5be/kf5backend.cxx @@ -41,6 +41,7 @@ #include <rtl/ustring.hxx> #include <sal/types.h> #include <uno/current_context.hxx> +#include <vcl/svapp.hxx> #include <osl/process.h> #include <osl/thread.h> @@ -172,14 +173,20 @@ void initQApp(std::map<OUString, css::beans::Optional<css::uno::Any>>& rSettings unsetenv("SESSION_MANAGER"); } - std::unique_ptr<QApplication> app(new QApplication(nFakeArgc, pFakeArgv)); - QObject::connect(app.get(), &QObject::destroyed, app.get(), [nFakeArgc, pFakeArgv]() { - for (int i = 0; i < nFakeArgc; ++i) - free(pFakeArgv[i]); - delete[] pFakeArgv; - }); - - readKDESettings(rSettings); + { + // rhbz#2047319 drop the SolarMutex during the execution of QApplication::init() + // https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/24#note_383915 + SolarMutexReleaser aReleaser; // rhbz#2047319 drop the SolarMutex during the execution + + std::unique_ptr<QApplication> app(new QApplication(nFakeArgc, pFakeArgv)); + QObject::connect(app.get(), &QObject::destroyed, app.get(), [nFakeArgc, pFakeArgv]() { + for (int i = 0; i < nFakeArgc; ++i) + free(pFakeArgv[i]); + delete[] pFakeArgv; + }); + + readKDESettings(rSettings); + } if (session_manager != nullptr) {
