1 files changed, 24 insertions, 28 deletions

diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
index 725288633a..eff38fc868 100644
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
@@ -67,6 +67,10 @@
 
 #include "qxcbnativeinterfacehandler.h"
 
+#if QT_CONFIG(vulkan)
+#include "qxcbvulkanwindow.h"
+#endif
+
 QT_BEGIN_NAMESPACE
 
 // return QXcbNativeInterface::ResourceType for the key.
@@ -82,7 +86,8 @@ static int resourceType(const QByteArray &key)
         QByteArrayLiteral("rootwindow"),
         QByteArrayLiteral("subpixeltype"), QByteArrayLiteral("antialiasingenabled"),
         QByteArrayLiteral("atspibus"),
-        QByteArrayLiteral("compositingenabled")
+        QByteArrayLiteral("compositingenabled"),
+        QByteArrayLiteral("vksurface")
     };
     const QByteArray *end = names + sizeof(names) / sizeof(names[0]);
     const QByteArray *result = std::find(names, end, key);
@@ -121,28 +126,19 @@ xcb_window_t QXcbNativeInterface::locateSystemTray(xcb_connection_t *conn, const
 {
     if (m_sysTraySelectionAtom == XCB_ATOM_NONE) {
         const QByteArray net_sys_tray = QString::fromLatin1("_NET_SYSTEM_TRAY_S%1").arg(screen->screenNumber()).toLatin1();
-        xcb_intern_atom_cookie_t intern_c =
-            xcb_intern_atom_unchecked(conn, true, net_sys_tray.length(), net_sys_tray);
-
-        xcb_intern_atom_reply_t *intern_r = xcb_intern_atom_reply(conn, intern_c, 0);
-
+        auto intern_r = Q_XCB_REPLY_UNCHECKED(xcb_intern_atom, conn,
+                                              true, net_sys_tray.length(), net_sys_tray);
         if (!intern_r)
             return XCB_WINDOW_NONE;
 
         m_sysTraySelectionAtom = intern_r->atom;
-        free(intern_r);
     }
 
-    xcb_get_selection_owner_cookie_t sel_owner_c = xcb_get_selection_owner_unchecked(conn, m_sysTraySelectionAtom);
-    xcb_get_selection_owner_reply_t *sel_owner_r = xcb_get_selection_owner_reply(conn, sel_owner_c, 0);
-
+    auto sel_owner_r = Q_XCB_REPLY_UNCHECKED(xcb_get_selection_owner, conn, m_sysTraySelectionAtom);
     if (!sel_owner_r)
         return XCB_WINDOW_NONE;
 
-    xcb_window_t selection_window = sel_owner_r->owner;
-    free(sel_owner_r);
-
-    return selection_window;
+    return sel_owner_r->owner;
 }
 
 bool QXcbNativeInterface::systrayVisualHasAlphaChannel()
@@ -266,6 +262,14 @@ void *QXcbNativeInterface::nativeResourceForWindow(const QByteArray &resourceStr
     case Screen:
         result = screenForWindow(window);
         break;
+#if QT_CONFIG(vulkan)
+    case VkSurface:
+        if (window->surfaceType() == QSurface::VulkanSurface && window->handle()) {
+            // return a pointer to the VkSurfaceKHR value, not the value itself
+            result = static_cast<QXcbVulkanWindow *>(window->handle())->surface();
+        }
+        break;
+#endif
     default:
         break;
     }
@@ -457,21 +461,13 @@ void *QXcbNativeInterface::atspiBus()
     QXcbConnection *defaultConnection = integration->defaultConnection();
     if (defaultConnection) {
         xcb_atom_t atspiBusAtom = defaultConnection->internAtom("AT_SPI_BUS");
-        xcb_get_property_cookie_t cookie = Q_XCB_CALL2(xcb_get_property(
-                                                           defaultConnection->xcb_connection(),
-                                                           false, defaultConnection->rootWindow(),
-                                                           atspiBusAtom, XCB_ATOM_STRING, 0, 128),
-                                                       defaultConnection);
-        xcb_get_property_reply_t *reply = Q_XCB_CALL2(xcb_get_property_reply(
-                                                          defaultConnection->xcb_connection(),
-                                                          cookie, 0),
-                                                      defaultConnection);
+        auto reply = Q_XCB_REPLY(xcb_get_property, defaultConnection->xcb_connection(),
+                                     false, defaultConnection->rootWindow(),
+                                     atspiBusAtom, XCB_ATOM_STRING, 0, 128);
         Q_ASSERT(!reply->bytes_after);
-        char *data = (char *)xcb_get_property_value(reply);
-        int length = xcb_get_property_value_length(reply);
-        QByteArray *busAddress = new QByteArray(data, length);
-        free(reply);
-        return busAddress;
+        char *data = (char *)xcb_get_property_value(reply.get());
+        int length = xcb_get_property_value_length(reply.get());
+        return new QByteArray(data, length);
     }
     return 0;
 }