AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop qvulkan headers from QtGui master header

Browse Source 
...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>
This commit is contained in:
Laszlo Agocs 2017-10-31 11:58:26 +01:00
parent 38bc995607
commit 89951262bf
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/vulkan/qvulkaninstance.h
View File

@ -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

4
src/gui/vulkan/qvulkanwindow.h
View File

@ -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>