vcl/qt5/Qt5Instance.cxx | 2 +-
vcl/unx/kde5/KDE5SalInstance.cxx | 2 --
vcl/unx/kde5/KDE5SalInstance.hxx | 2 --
3 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 3448ffae2f2a7a0cdef6626f747b6b95b87f596b
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Mar 23 04:16:37 2019 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Mar 23 09:53:12 2019 +0100
Qt5 fix Qt5Instance::IsMainThread()
... and I was wondering why Qt5 didn't start anymore. Looks like
it was already broken in my initial commit :-(
Now there is also no more need for the KDE5SalInstance "variant".
Change-Id: I035d31eaf191b3f2a4255869cea25394470d0dd0
Reviewed-on: https://gerrit.libreoffice.org/69577
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 05ebf9aafb1b..429b69f90b79 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -378,7 +378,7 @@ void Qt5Instance::AddToRecentDocumentList(const OUString&,
const OUString&, cons
OpenGLContext* Qt5Instance::CreateOpenGLContext() { return new
Qt5OpenGLContext; }
-bool Qt5Instance::IsMainThread() const { return qApp->thread() !=
QThread::currentThread(); }
+bool Qt5Instance::IsMainThread() const { return qApp->thread() ==
QThread::currentThread(); }
void Qt5Instance::TriggerUserEventProcessing()
{
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index 0847e99c0f79..6bca4d88a90c 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -86,8 +86,6 @@ KDE5SalInstance::createFolderPicker(const
uno::Reference<uno::XComponentContext>
return uno::Reference<ui::dialogs::XFolderPicker2>(new
KDE5FilePicker(QFileDialog::Directory));
}
-bool KDE5SalInstance::IsMainThread() const { return qApp->thread() ==
QThread::currentThread(); }
-
extern "C" {
VCLPLUG_KDE5_PUBLIC SalInstance* create_SalInstance()
{
diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx
index 5980ea4699cc..dbca2ef3b830 100644
--- a/vcl/unx/kde5/KDE5SalInstance.hxx
+++ b/vcl/unx/kde5/KDE5SalInstance.hxx
@@ -40,8 +40,6 @@ public:
virtual css::uno::Reference<css::ui::dialogs::XFolderPicker2>
createFolderPicker(const
css::uno::Reference<css::uno::XComponentContext>&) override;
- virtual bool IsMainThread() const override;
-
private:
virtual SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags
nStyle) override;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
