From 89951262bf8bbc764ee15be53e63e0294dae15db Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 31 Oct 2017 11:58:26 +0100 Subject: Drop qvulkan headers from QtGui master header ...in order to allow applications built against Vulkan-enabled pre-built packages to include on systems without Vulkan headers. This has the downside of not being able to pull in qvulkan* headers via the master header. This is an acceptable compromise for now. Task-number: QTBUG-64073 Change-Id: I63c5834dcec60e66aba34c003d4bfe8e7d31607f Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Oswald Buddenhagen --- src/gui/vulkan/qvulkaninstance.h | 4 ++++ src/gui/vulkan/qvulkanwindow.h | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'src/gui/vulkan') diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h index ada297be43..57459e458c 100644 --- a/src/gui/vulkan/qvulkaninstance.h +++ b/src/gui/vulkan/qvulkaninstance.h @@ -42,6 +42,10 @@ #include +#if 0 +#pragma qt_no_master_include +#endif + #if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) #ifndef VK_NO_PROTOTYPES diff --git a/src/gui/vulkan/qvulkanwindow.h b/src/gui/vulkan/qvulkanwindow.h index 65249ecbfc..927c81042f 100644 --- a/src/gui/vulkan/qvulkanwindow.h +++ b/src/gui/vulkan/qvulkanwindow.h @@ -42,6 +42,10 @@ #include +#if 0 +#pragma qt_no_master_include +#endif + #if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) #include -- cgit v1.2.3