diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2024-08-15 11:29:36 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2024-08-15 20:36:42 +0200 |
| commit | 2f6f717073084b17e9be80e32a87200bacd1b74c (patch) | |
| tree | 69a58fdfa9fb06f09bca88e746a2a9609f6f1b67 /vcl/inc/qt5 | |
| parent | 445ab7c94ca547f1d8d37c85a26fac2ef8d86ce6 (diff) | |
qt: Drop X11 condition for session/screensaver inhibition
The DBus based session/sreenlock inhibition work on Wayland
just fine, and in a quick test with the qt6 VCL plugin on
Plasma 5 Wayland on Debian testing, the screen saver is
inhibited as expected and doesn't start while an Impress
presentation is running.
The code in `QtFrame::StartPresentation` being
guarded by a `CHECK_ANY_QT_USING_X11` at first
looks like this was all X11-only code.
It already worked just fine on Wayland before
that commit however, as it's a build time check only,
and X11 is enabled by default at build time,
and the code would run just fine on Wayland then
with a null X11 Display.
Drop the `CHECK_ANY_QT_USING_X11` (build-time)
condition altogether, now that `USING_X11` is no more
required after
Change-Id: Ic46c3f18151340a5ea6c0b62a82c957fd1cd6484
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Thu Aug 15 10:13:27 2024 +0200
vcl: Allow DBus-based session inhibition without requiring X11
Move the X11-specific code into the `#if CHECK_QT5_USING_X11` block
and call the overload that doesn't require an X11 Display otherwise.
Change-Id: Idee0564d136e59ce54945670dee26df0cfc64d85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171896
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Diffstat (limited to 'vcl/inc/qt5')
| -rw-r--r-- | vcl/inc/qt5/QtFrame.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/qt5/QtFrame.hxx b/vcl/inc/qt5/QtFrame.hxx index b80818687c0e..57a1b8cd1e2c 100644 --- a/vcl/inc/qt5/QtFrame.hxx +++ b/vcl/inc/qt5/QtFrame.hxx @@ -33,8 +33,8 @@ #include <QtCore/QObject> -#if CHECK_ANY_QT_USING_X11 #include <unx/sessioninhibitor.hxx> +#if CHECK_ANY_QT_USING_X11 // any better way to get rid of the X11 / Qt type clashes? #undef Bool #undef CursorShape @@ -101,8 +101,8 @@ class VCLPLUG_QT_PUBLIC QtFrame : public QObject, public SalFrame sal_uInt32 m_nRestoreScreen; QRect m_aRestoreGeometry; -#if CHECK_ANY_QT_USING_X11 SessionManagerInhibitor m_SessionManagerInhibitor; +#if CHECK_ANY_QT_USING_X11 ModKeyFlags m_nKeyModifiers; #endif |