diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-10-31 11:58:26 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-11-03 05:57:38 +0000 |
| commit | 89951262bf8bbc764ee15be53e63e0294dae15db (patch) | |
| tree | a722ad44541c10bdffe08ed67f4c96da8349ff4a /src | |
| parent | 38bc9956079e2291d19b15d68cc2e6dd4a20f202 (diff) | |
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 <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/vulkan/qvulkaninstance.h | 4 | ||||
| -rw-r--r-- | src/gui/vulkan/qvulkanwindow.h | 4 |
2 files changed, 8 insertions, 0 deletions
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 <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 index 65249ecbfc..927c81042f 100644 --- 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> |