diff options
| author | Martin Smith <martin.smith@qt.io> | 2018-01-17 11:40:45 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2018-01-18 06:32:25 +0000 |
| commit | 8b9b3e2f29e06106ac6b3bc4cc60bc0a13ec0083 (patch) | |
| tree | 5a1ebfebb84b9376668e1a8c15dd334c68b4b1d3 /src/gui/kernel | |
| parent | 20be99dec52d4c6922ec84b3836b549f505738cf (diff) | |
doc: Fix remaining qdoc warmings for Vulkan stuff
Several uses of #if QT_CONFIG(vulkan) were modified to
for classes QVulkanFunctions and QVulkanDeviceFunctions
was added to qplatformvulkaninstance.h, because the
include file that contains them doesn't exist when
vulkan isn't there.
Change-Id: I392202ab5fe9bb4c558a991870e6ebf79254aec0
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qplatformintegration.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformintegration.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwindow.h | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp index 873ec3a33b..151151de23 100644 --- a/src/gui/kernel/qplatformintegration.cpp +++ b/src/gui/kernel/qplatformintegration.cpp @@ -629,7 +629,7 @@ void QPlatformIntegration::setApplicationIcon(const QIcon &icon) const Q_UNUSED(icon); } -#if QT_CONFIG(vulkan) +#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) /*! Factory function for QPlatformVulkanInstance. The \a instance parameter is a diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h index eeaa7574f7..a7d9a87502 100644 --- a/src/gui/kernel/qplatformintegration.h +++ b/src/gui/kernel/qplatformintegration.h @@ -192,7 +192,7 @@ public: virtual void beep() const; -#if QT_CONFIG(vulkan) +#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) virtual QPlatformVulkanInstance *createPlatformVulkanInstance(QVulkanInstance *instance) const; #endif diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 3e5777ad49..2c7e061bcf 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -2841,7 +2841,7 @@ QDebug operator<<(QDebug debug, const QWindow *window) } #endif // !QT_NO_DEBUG_STREAM -#if QT_CONFIG(vulkan) +#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) /*! Associates this window with the specified Vulkan \a instance. diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index ac5543f884..439e62d0bd 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -88,7 +88,7 @@ class QWindowContainer; #ifndef QT_NO_DEBUG_STREAM class QDebug; #endif -#if QT_CONFIG(vulkan) +#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) class QVulkanInstance; #endif @@ -270,7 +270,7 @@ public: static QWindow *fromWinId(WId id); -#if QT_CONFIG(vulkan) +#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) void setVulkanInstance(QVulkanInstance *instance); QVulkanInstance *vulkanInstance() const; #endif @@ -378,6 +378,7 @@ private: }; #ifndef Q_QDOC +// should these be seen by clang-qdoc? template <> inline QWindow *qobject_cast<QWindow*>(QObject *o) { if (!o || !o->isWindowType()) return nullptr; |