diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-01 08:53:25 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-01 13:30:41 +0100 |
| commit | 4437071c3f7c0b51881b0b1a5d5a68bdd100328b (patch) | |
| tree | d7f584de52587070c39a979ce6d6362be21cdd44 /vcl/inc/qt5/QtFrame.hxx | |
| parent | 5b253b2197e957fb5e42e3d0e233c10ac83afc10 (diff) | |
Qt fix non-X11 build and introduce CHECK_* macros
Explicitly uses ANY, so it's hopefully easier to read then QT,
QT5 and QT6 in the otherwise same macro names.
Change-Id: Ie9bbbc858f5f9db5c8b429c7b0d8a897ac6159fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126168
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/inc/qt5/QtFrame.hxx')
| -rw-r--r-- | vcl/inc/qt5/QtFrame.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/inc/qt5/QtFrame.hxx b/vcl/inc/qt5/QtFrame.hxx index c3c9cdb9f309..61d175cf2625 100644 --- a/vcl/inc/qt5/QtFrame.hxx +++ b/vcl/inc/qt5/QtFrame.hxx @@ -32,7 +32,7 @@ #include <QtCore/QObject> -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT5_USING_X11 +#if CHECK_QT5_USING_X11 #include <unx/screensaverinhibitor.hxx> // any better way to get rid of the X11 / Qt type clashes? #undef Bool @@ -100,11 +100,10 @@ class VCLPLUG_QT_PUBLIC QtFrame : public QObject, public SalFrame sal_uInt32 m_nRestoreScreen; QRect m_aRestoreGeometry; -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT5_USING_X11 +#if CHECK_QT5_USING_X11 ScreenSaverInhibitor m_ScreenSaverInhibitor; #endif -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT5_USING_X11) \ - || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT6_USING_X11) +#if CHECK_ANY_QT_USING_X11 ModKeyFlags m_nKeyModifiers; #endif |