Vulkan: share library loading implementation

The macOS, Windows, and XCB implementations are identical
and can be moved to QBasicPlatformVulkanInstance.

Change-Id: Id84b27ffd87f86afe3798c4ad2743ba05e6190d3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

2 files changed, 1 insertions, 12 deletions

diff --git a/src/plugins/platforms/xcb/qxcbvulkaninstance.cpp b/src/plugins/platforms/xcb/qxcbvulkaninstance.cpp
index 5a6a4ef809..b3f8a5832d 100644
--- a/src/plugins/platforms/xcb/qxcbvulkaninstance.cpp
+++ b/src/plugins/platforms/xcb/qxcbvulkaninstance.cpp
@@ -48,17 +48,7 @@ QXcbVulkanInstance::QXcbVulkanInstance(QVulkanInstance *instance)
       m_getPhysDevPresSupport(nullptr),
       m_createSurface(nullptr)
 {
-    if (qEnvironmentVariableIsSet("QT_VULKAN_LIB"))
-        m_lib.setFileName(QString::fromUtf8(qgetenv("QT_VULKAN_LIB")));
-    else
-        m_lib.setFileName(QStringLiteral("vulkan"));
-
-    if (!m_lib.load()) {
-        qWarning("Failed to load %s: %s", qPrintable(m_lib.fileName()), qPrintable(m_lib.errorString()));
-        return;
-    }
-
-    init(&m_lib);
+    loadVulkanLibrary(QStringLiteral("vulkan"));
 }
 
 QXcbVulkanInstance::~QXcbVulkanInstance()
diff --git a/src/plugins/platforms/xcb/qxcbvulkaninstance.h b/src/plugins/platforms/xcb/qxcbvulkaninstance.h
index c5981d3605..53f7345254 100644
--- a/src/plugins/platforms/xcb/qxcbvulkaninstance.h
+++ b/src/plugins/platforms/xcb/qxcbvulkaninstance.h
@@ -67,7 +67,6 @@ public:
 
 private:
     QVulkanInstance *m_instance;
-    QLibrary m_lib;
     PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR m_getPhysDevPresSupport;
     PFN_vkCreateXcbSurfaceKHR m_createSurface;
 };