1 files changed, 11 insertions, 6 deletions
diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp
index f503509..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;
@@ -310,10 +315,10 @@ unsigned long QX11Info::getTimestamp()
 QByteArray QX11Info::nextStartupId()
 {
     if (!qApp)
-        return 0;
+        return QByteArray();
     QPlatformNativeInterface *native = qApp->platformNativeInterface();
     if (!native)
-        return 0;
+        return QByteArray();
     return static_cast<char *>(native->nativeResourceForIntegration("startupid"));
 }
 
@@ -352,10 +357,10 @@ void QX11Info::setNextStartupId(const QByteArray &id)
 Display *QX11Info::display()
 {
     if (!qApp)
-        return NULL;
+        return nullptr;
     QPlatformNativeInterface *native = qApp->platformNativeInterface();
     if (!native)
-        return NULL;
+        return nullptr;
 
     void *display = native->nativeResourceForIntegration(QByteArray("display"));
     return reinterpret_cast<Display *>(display);
@@ -369,10 +374,10 @@ Display *QX11Info::display()
 xcb_connection_t *QX11Info::connection()
 {
     if (!qApp)
-        return NULL;
+        return nullptr;
     QPlatformNativeInterface *native = qApp->platformNativeInterface();
     if (!native)
-        return NULL;
+        return nullptr;
 
     void *connection = native->nativeResourceForIntegration(QByteArray("connection"));
     return reinterpret_cast<xcb_connection_t *>(connection);