summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-11-11 12:59:15 +0100
committerTopi Reinio <topi.reinio@qt.io>2020-11-12 06:55:01 +0100
commit5d8a04f007bdd30772c9395af377385d19e80be9 (patch)
tree2f7cbb08f3f7a5e025df8f245147e1908ca7603a
parent25bda72630af1529fbca4ef821c45e3b74896ada (diff)
Doc: Fix documentation warnings for Qt Widgets
- Exclude forwarding headers to Qt GUI as they caused the headers to be parsed twice. - Drop documentation for removed example Task-number: QTBUG-86295 Change-Id: I08eb46b7c7f813f103cc545f931896be99a3ccec Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--examples/widgets/doc/src/boxes.qdoc48
-rw-r--r--src/widgets/doc/qtwidgets.qdocconf9
-rw-r--r--src/widgets/kernel/qwidget.cpp2
3 files changed, 10 insertions, 49 deletions
diff --git a/examples/widgets/doc/src/boxes.qdoc b/examples/widgets/doc/src/boxes.qdoc
deleted file mode 100644
index 276c6fa78d..0000000000
--- a/examples/widgets/doc/src/boxes.qdoc
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \example graphicsview/boxes
- \title Boxes
- \ingroup examples-graphicsview
- \brief Combines advanced OpenGL rendering with the Graphics View framework.
-
- \image boxes-demo.png
-
- Elements in the demo can be controlled using the mouse in the following
- ways:
- \list
- \li Dragging the mouse while pressing the left mouse button rotates the
- box in the center.
- \li Dragging the mouse while pressing the right mouse button rotates the
- satellite boxes.
- \li Scrolling the mouse wheel zooms in and out of the scene.
- \endlist
-
- The options pane can be used to fine-tune various parameters in the demo,
- including colors and pixel shaders.
-*/
diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf
index ae9ea6ddb2..eb51c7b093 100644
--- a/src/widgets/doc/qtwidgets.qdocconf
+++ b/src/widgets/doc/qtwidgets.qdocconf
@@ -48,6 +48,15 @@ excludedirs += snippets
# Included in qttestlib.qdocconf instead
excludefiles += ../kernel/qtestsupport_widgets.cpp
+# Exclude forwarding headers to QtGUI to avoid duplicates in the node tree
+excludefiles += \
+ ../dialogs/qfilesystemmodel.h \
+ ../kernel/qaction.h \
+ ../kernel/qactiongroup.h \
+ ../kernel/qshortcut.h \
+ ../util/qundogroup.h \
+ ../util/qundostack.h
+
imagedirs += images \
../../../doc/src/images \
../../../examples/widgets/doc/images \
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index bec7dc9edd..5890ee4702 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -12493,7 +12493,7 @@ QWidget *QWidget::keyboardGrabber()
does not allow an application to interrupt what the user is currently
doing in another application.
- \sa isActiveWindow(), window(), show(), QWindowsWindowFunctions::setWindowActivationBehavior()
+ \sa isActiveWindow(), window(), show()
*/
void QWidget::activateWindow()
{