Drop qvulkan headers from QtGui master header

...in order to allow applications built against Vulkan-enabled pre-built packages to include <QtGui> 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 <[email protected]> Reviewed-by: Oswald Buddenhagen <[email protected]>
RDevCore · Nov 3, 2017 · 8995126 · 8995126
1 parent 38bc995
commit 8995126
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h
@@ -42,6 +42,10 @@
 
 #include <QtGui/qtguiglobal.h>
 
+#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
@@ -42,6 +42,10 @@
 
 #include <QtGui/qtguiglobal.h>
 
+#if 0
+#pragma qt_no_master_include
+#endif
+
 #if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC)
 
 #include <QtGui/qvulkaninstance.h>