Doc: Drop the use of QT_PLUGIN_PATH in documentation config

This caused build issues in certain configurations. We don't actually
need it, as we can rely on the base Qt include path instead.

Also move the custom header under src/quick/doc and rename it.

Task-number: QTBUG-67342
Change-Id: Id75e140f9d286f6a47c2ecc039bfb52b13a92608
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>

3 files changed, 5 insertions, 48 deletions

diff --git a/src/quick/QtQuick_pch.h b/src/quick/QtQuick_pch.h
deleted file mode 100644
index 5d66631e7f..0000000000
--- a/src/quick/QtQuick_pch.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifdef Q_CLANG_QDOC
-#ifndef QTQUICK_PCH
-#define QTQUICK_PCH
-#include <QtQuick>
-#include <QtQuickWidgets>
-#endif
-#endif
diff --git a/src/quick/doc/QtQuickDoc b/src/quick/doc/QtQuickDoc
new file mode 100644
index 0000000000..6c151f2ebd
--- /dev/null
+++ b/src/quick/doc/QtQuickDoc
@@ -0,0 +1,2 @@
+#include <QtQuick/QtQuick>
+#include <QtQuickWidgets/QtQuickWidgets>
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index b6ddb7bf8b..c137d1d2c8 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -5,10 +5,10 @@ description             = Qt Quick Reference Documentation
 version                 = $QT_VERSION
 
 examplesinstallpath     = quick
-moduleheader            = QtQuick_pch.h
 
-includepaths            = -I $QT_PLUGIN_PATH/../include/QtQuick \
-                          -I $QT_PLUGIN_PATH/../include/QtQuickWidgets
+# Custom module header that pulls in also QtQuickWidgets
+moduleheader            = QtQuickDoc
+includepaths            = -I .
 
 qhp.projects            = QtQuick