diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-01-09 16:34:07 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-01-09 20:57:05 +0100 |
| commit | 0a78e5f117a1988b4cf41195b4ac57ea3010a041 (patch) | |
| tree | 0dd9ad646c78ec892d1dba600e893a8b6a35084e /src/plugins/platforms | |
| parent | a59c7684897bfbbb7ddcec2f05263fee92ab5056 (diff) | |
xcb: Fix nullptr vs. VK_NULL_HANDLE error
Fallout from a recent 0 - nullptr fixup in 5.15.
Change-Id: I17adf742d4f65dc6a468fbe72d0f02d3efa276d7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbvulkaninstance.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbvulkanwindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbvulkaninstance.cpp b/src/plugins/platforms/xcb/qxcbvulkaninstance.cpp index 7c15882768..bb82bcec39 100644 --- a/src/plugins/platforms/xcb/qxcbvulkaninstance.cpp +++ b/src/plugins/platforms/xcb/qxcbvulkaninstance.cpp @@ -93,7 +93,7 @@ bool QXcbVulkanInstance::supportsPresent(VkPhysicalDevice physicalDevice, VkSurfaceKHR QXcbVulkanInstance::createSurface(QXcbWindow *window) { - VkSurfaceKHR surface = nullptr; + VkSurfaceKHR surface = VK_NULL_HANDLE; if (!m_createSurface) { m_createSurface = reinterpret_cast<PFN_vkCreateXcbSurfaceKHR>( diff --git a/src/plugins/platforms/xcb/qxcbvulkanwindow.cpp b/src/plugins/platforms/xcb/qxcbvulkanwindow.cpp index 17d7d9791e..a05ecab51d 100644 --- a/src/plugins/platforms/xcb/qxcbvulkanwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbvulkanwindow.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE QXcbVulkanWindow::QXcbVulkanWindow(QWindow *window) : QXcbWindow(window), - m_surface(nullptr) + m_surface(VK_NULL_HANDLE) { } |