From f978fe26c8e10f172035b782d874acc6957d9818 Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@qt.io>
Date: Tue, 8 Sep 2020 12:53:46 +0200
Subject: Doc: Qt GUI: Fix custom module header

There were two custom module headers for Qt GUI under different include
paths. Combine them into one.

Change-Id: I8b699d82820bee36a9ce8c384b94d1b99305e177
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 src/gui/doc/QtGuiDoc          | 10 ----------
 src/gui/doc/includes/QtGuiDoc | 10 ++++++++++
 src/gui/doc/qtgui.qdocconf    |  3 ---
 3 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 src/gui/doc/QtGuiDoc

(limited to 'src/gui')

diff --git a/src/gui/doc/QtGuiDoc b/src/gui/doc/QtGuiDoc
deleted file mode 100644
index a8ec4fb643..0000000000
--- a/src/gui/doc/QtGuiDoc
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <QtGui/QtGui>
-
-#include <QtGui/QVulkanDeviceFunctions>
-#include <QtGui/QVulkanExtension>
-#include <QtGui/QVulkanFunctions>
-#include <QtGui/QVulkanInfoVector>
-#include <QtGui/QVulkanInstance>
-#include <QtGui/QVulkanLayer>
-#include <QtGui/QVulkanWindow>
-#include <QtGui/QVulkanWindowRenderer>
diff --git a/src/gui/doc/includes/QtGuiDoc b/src/gui/doc/includes/QtGuiDoc
index 77b598f006..00d01afa9c 100644
--- a/src/gui/doc/includes/QtGuiDoc
+++ b/src/gui/doc/includes/QtGuiDoc
@@ -1,5 +1,15 @@
 #include <QtGui/QtGui>
 
+// vulkan
+#include <QtGui/QVulkanDeviceFunctions>
+#include <QtGui/QVulkanExtension>
+#include <QtGui/QVulkanFunctions>
+#include <QtGui/QVulkanInfoVector>
+#include <QtGui/QVulkanInstance>
+#include <QtGui/QVulkanLayer>
+#include <QtGui/QVulkanWindow>
+#include <QtGui/QVulkanWindowRenderer>
+
 // native platform interfaces
 #include <QtGui/qpa/qplatformmenu_p.h>
 #include <QtGui/qpa/qplatformwindow_p.h>
diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
index 2ec3470d4c..e08219fedd 100644
--- a/src/gui/doc/qtgui.qdocconf
+++ b/src/gui/doc/qtgui.qdocconf
@@ -1,9 +1,6 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 include($QT_INSTALL_DOCS/config/exampleurl-qtbase.qdocconf)
 
-includepaths += .
-moduleheader = QtGuiDoc
-
 project                 = QtGui
 description             = Qt GUI Reference Documentation
 version                 = $QT_VERSION
-- 
cgit v1.2.3