diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:01:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:01:46 +0100 |
| commit | 24437a40eb70322da6c5ed44d38fe93c203fec42 (patch) | |
| tree | 019b2c2d9de8865f09d02003b8083c5378c32fef | |
| parent | ac5ec124961db93112bb33772d90bd3931893a4c (diff) | |
| parent | 8dae14239247281ce36a9e92308a506f149574db (diff) | |
| download | qtx11extras-24437a40eb70322da6c5ed44d38fe93c203fec42.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I88c492f19463fa9d289c24cd04d9251cf11bd15e
| -rw-r--r-- | src/x11extras/qx11info_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp index 394a629..7b6b2a0 100644 --- a/src/x11extras/qx11info_x11.cpp +++ b/src/x11extras/qx11info_x11.cpp @@ -154,6 +154,8 @@ int QX11Info::appDpiY(int screen) return scr->logicalDotsPerInchY(); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +// ### Qt 6: remove /*! Returns a handle for the applications root window on the given \a screen. @@ -164,8 +166,6 @@ int QX11Info::appDpiY(int screen) \sa QApplication::desktop() */ -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -// ### Qt 6: remove unsigned long QX11Info::appRootWindow(int screen) #else quint32 QX11Info::appRootWindow(int screen) |