summaryrefslogtreecommitdiffstats
path: root/src/gui/rhi/qrhivulkan.cpp
diff options
context:
space:
mode:
authorAlexander Volkov <avolkov@astralinux.ru>2020-07-29 13:11:29 +0300
committerAlexander Volkov <avolkov@astralinux.ru>2020-07-29 15:35:01 +0300
commit2b781fd678c9d462a07173294da9f313c50b2ae4 (patch)
tree45e7e6a66d3461688681a8f7953b2140cde2f045 /src/gui/rhi/qrhivulkan.cpp
parente7ade6092580ebc3eb77b1505007c30f6034f063 (diff)
Revert "Add missing override" for 3rdparty vk_mem_alloc.h
This partially reverts 9bad3508fccb058261d47e023400868147f2d733. Disable -Wsuggest-override for gcc when including the header instead. Change-Id: Id2507ce731da62bbd64aa6477b181735ba62adc1 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/rhi/qrhivulkan.cpp')
-rw-r--r--src/gui/rhi/qrhivulkan.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp
index 46a6146f20..ab74376bc5 100644
--- a/src/gui/rhi/qrhivulkan.cpp
+++ b/src/gui/rhi/qrhivulkan.cpp
@@ -44,7 +44,10 @@
#ifdef QT_DEBUG
#define VMA_DEBUG_INITIALIZE_ALLOCATIONS 1
#endif
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_GCC("-Wsuggest-override")
#include "vk_mem_alloc.h"
+QT_WARNING_POP
#include <qmath.h>
#include <QVulkanFunctions>