summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2017-03-29 10:48:10 +0200
committerMartin Smith <martin.smith@qt.io>2017-03-31 11:29:36 +0000
commit28d286dc96f4628aa5bba5631ce563cb979b1bfb (patch)
tree8e0df34b7b52c8ec49bf633ca786f11aba19571d
parent98ef6c4afa068a513f133f02653f033cea3254e9 (diff)
doc: Ensure that clangqdoc sees QVulkanInstance decl
clangqdoc must see the declaration in vulkan regardless of whether Qt is configured with vulkan. Change-Id: I91fcaa4c39121b70e10c4fc3e854e49d959a6c02 Reviewed-by: Martin Smith <martin.smith@qt.io>
-rw-r--r--src/gui/vulkan/qplatformvulkaninstance.h2
-rw-r--r--src/gui/vulkan/qvulkaninstance.h2
-rw-r--r--src/gui/vulkan/qvulkanwindow.h2
-rw-r--r--src/gui/vulkan/qvulkanwindow_p.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/vulkan/qplatformvulkaninstance.h b/src/gui/vulkan/qplatformvulkaninstance.h
index 5513d1767d..9470e2d0b4 100644
--- a/src/gui/vulkan/qplatformvulkaninstance.h
+++ b/src/gui/vulkan/qplatformvulkaninstance.h
@@ -51,7 +51,7 @@
#include <QtGui/qtguiglobal.h>
-#if QT_CONFIG(vulkan)
+#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC)
#include <qvulkaninstance.h>
diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h
index b3f08cf0d8..5dd00dcfb1 100644
--- a/src/gui/vulkan/qvulkaninstance.h
+++ b/src/gui/vulkan/qvulkaninstance.h
@@ -42,7 +42,7 @@
#include <QtGui/qtguiglobal.h>
-#if QT_CONFIG(vulkan)
+#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC)
#ifndef VK_NO_PROTOTYPES
#define VK_NO_PROTOTYPES
diff --git a/src/gui/vulkan/qvulkanwindow.h b/src/gui/vulkan/qvulkanwindow.h
index 854da81b05..c32c40d459 100644
--- a/src/gui/vulkan/qvulkanwindow.h
+++ b/src/gui/vulkan/qvulkanwindow.h
@@ -42,7 +42,7 @@
#include <QtGui/qtguiglobal.h>
-#if QT_CONFIG(vulkan)
+#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC)
#include <QtGui/qvulkaninstance.h>
#include <QtGui/qwindow.h>
diff --git a/src/gui/vulkan/qvulkanwindow_p.h b/src/gui/vulkan/qvulkanwindow_p.h
index 9d2f13c87e..c6a772bc31 100644
--- a/src/gui/vulkan/qvulkanwindow_p.h
+++ b/src/gui/vulkan/qvulkanwindow_p.h
@@ -42,7 +42,7 @@
#include <QtGui/private/qtguiglobal_p.h>
-#if QT_CONFIG(vulkan)
+#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC)
#include "qvulkanwindow.h"
#include <QtCore/QHash>