summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/x11extras/qx11info_x11.cpp5
-rw-r--r--src/x11extras/qx11info_x11.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp
index 77caca7..394a629 100644
--- a/src/x11extras/qx11info_x11.cpp
+++ b/src/x11extras/qx11info_x11.cpp
@@ -164,7 +164,12 @@ 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)
+#endif
{
if (!qApp)
return 0;
diff --git a/src/x11extras/qx11info_x11.h b/src/x11extras/qx11info_x11.h
index c0bfbf8..20f048a 100644
--- a/src/x11extras/qx11info_x11.h
+++ b/src/x11extras/qx11info_x11.h
@@ -63,7 +63,11 @@ public:
static int appDpiX(int screen=-1);
static int appDpiY(int screen=-1);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
static unsigned long appRootWindow(int screen=-1);
+#else
+ static quint32 appRootWindow(int screen=-1);
+#endif
static int appScreen();
static unsigned long appTime();