From 641d50eeb0272544e3eaff6c10bdefcdc544106a Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Tue, 6 Mar 2018 15:21:38 +0100 Subject: doc: Fix qtquick.qdocconf to include stuff for qtquickwidgets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A fake module header is added for qtquick named QtQuick_pch.h, and qtquick.qdocconf is modified to use this fake module header instead of using QtQuick. The fake module header includes QtQuick and QtQuickWidgets. Change-Id: I2a3bd4ad32bdad878f8e7049cf71c393517547a0 Reviewed-by: Topi Reiniö --- src/quick/QtQuick_pch.h | 45 ++++++++++++++++++++++++++++++++++++++++++ src/quick/doc/qtquick.qdocconf | 4 ++++ 2 files changed, 49 insertions(+) create mode 100644 src/quick/QtQuick_pch.h (limited to 'src/quick') diff --git a/src/quick/QtQuick_pch.h b/src/quick/QtQuick_pch.h new file mode 100644 index 0000000000..5d66631e7f --- /dev/null +++ b/src/quick/QtQuick_pch.h @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** 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 +#include +#endif +#endif diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 7ce0dfcf09..b6ddb7bf8b 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -5,6 +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 qhp.projects = QtQuick -- cgit v1.2.3