diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-09-02 15:53:12 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-09-06 17:10:06 +0000 |
| commit | 2105f801696759a365c4f928712de02e0e38e591 (patch) | |
| tree | 0925b1d36eea74b53dd3a01ef533a8c81637e620 /src/plugins/platforms | |
| parent | deab54f84f5771755c714e52b4587f152de09446 (diff) | |
cocoa: Fix build with MoltenVK
Change-Id: If92afa2d30d55e1dd2968f582350ba2cf16fe27b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoavulkaninstance.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoavulkaninstance.h b/src/plugins/platforms/cocoa/qcocoavulkaninstance.h index 018488a0a1..5fe6a612af 100644 --- a/src/plugins/platforms/cocoa/qcocoavulkaninstance.h +++ b/src/plugins/platforms/cocoa/qcocoavulkaninstance.h @@ -40,13 +40,17 @@ #ifndef QCOCOAVULKANINSTANCE_H #define QCOCOAVULKANINSTANCE_H +// Include mvk_vulkan.h first. The order is important since +// mvk_vulkan.h just defines VK_USE_PLATFORM_MACOS_MVK (or the IOS +// variant) and includes vulkan.h. If something else included vulkan.h +// before this then we wouldn't get the MVK specifics... +#include <MoltenVK/mvk_vulkan.h> + #include <QtCore/QHash> #include <QtVulkanSupport/private/qbasicvulkanplatforminstance_p.h> #include <AppKit/AppKit.h> -#include <MoltenVK/mvk_vulkan.h> - QT_BEGIN_NAMESPACE class QCocoaVulkanInstance : public QBasicPlatformVulkanInstance |