strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rhbz#2047319 drop the SolarMutex before QApplication::init()

Browse source 
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 <m.weghorn@posteo.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2022-02-02 16:21:43 +00:00
parent 8f67e2633a
commit f6180e3e87
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
shell/Library_kf5be.mk
View file

@ -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))

21
shell/source/backends/kf5be/kf5backend.cxx
View file

@ -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;
});
{
// 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
readKDESettings(rSettings);
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)
{