From 39396409656b12940ffe9b715f13e23ac4290eca Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 23 Jan 2020 15:48:15 +0100 Subject: Fix some qdoc-warnings src/corelib/tools/qmap.cpp:1199: (qdoc) warning: Can't link to 'QMultiMap::unite()' src/gui/kernel/qevent.cpp:949: (qdoc) warning: Unknown command '\see' src/gui/painting/qpaintengine_raster.cpp:344: (qdoc) warning: clang found diagnostics parsing \fn Type QRasterPaintEngine::type() const error: unknown type name 'Type' src/gui/doc/src/qtgui.qdoc:45: (qdoc) warning: Can't link to 'Build with CMake' examples/widgets/doc/src/gallery.qdoc:28: (qdoc) warning: Cannot find file 'widgets/gallery/gallery.pro' or 'widgets/gallery/gallery.pyproject' src/widgets/kernel/qwidget.cpp:5950: (qdoc) warning: Can't link to 'setFilePath' src/widgets/kernel/qshortcut.cpp:542: (qdoc) warning: No such parameter 'context' in QShortcut::QShortcut() Change-Id: I2395af854efebef719d4762da466f69f7c5aab9e Reviewed-by: Paul Wicking --- examples/widgets/doc/src/gallery.qdoc | 2 +- src/corelib/tools/qmap.cpp | 2 +- src/gui/doc/src/qtgui.qdoc | 2 +- src/gui/kernel/qevent.cpp | 2 +- src/gui/painting/qpaintengine_raster.cpp | 2 +- src/widgets/kernel/qshortcut.cpp | 2 +- src/widgets/kernel/qwidget.cpp | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/widgets/doc/src/gallery.qdoc b/examples/widgets/doc/src/gallery.qdoc index a262374ce6..455099ddce 100644 --- a/examples/widgets/doc/src/gallery.qdoc +++ b/examples/widgets/doc/src/gallery.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example widgets/gallery + \example gallery \title Widgets Gallery Example \ingroup examples-widgets \brief The Widgets Gallery example shows widgets relevant for designing UIs. diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index d747a8cda4..a51e59b2b8 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -1203,7 +1203,7 @@ void QMapDataBase::freeData(QMapDataBase *d) key is common to both maps, the resulting map will contain the key multiple times. - \sa QMultiMap::unite() + \sa QMap::unite() */ /*! \typedef QMap::Iterator diff --git a/src/gui/doc/src/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc index 392b6040cb..f8a3ce84aa 100644 --- a/src/gui/doc/src/qtgui.qdoc +++ b/src/gui/doc/src/qtgui.qdoc @@ -62,7 +62,7 @@ \include module-use.qdocinc using qt module \quotefile overview/using-qt-gui.cmake - See also the \l[QtDoc]{Build with CMake} overview. + See also the \l{Build with CMake} overview. \section2 Building with qmake diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 3362294435..da77290c30 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -946,7 +946,7 @@ QWheelEvent::~QWheelEvent() \li or scrolling has ended and the distance did not change anymore (Qt::ScrollEnd). \endlist - \see pixelDelta() + \sa pixelDelta() */ /*! diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index bc65ed56e3..10920c38fe 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -342,7 +342,7 @@ QRasterPaintEnginePrivate::QRasterPaintEnginePrivate() : */ /*! - \fn Type QRasterPaintEngine::type() const + \fn QPaintEngine::Type QRasterPaintEngine::type() const \reimp */ diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp index d469279ea5..039699a004 100644 --- a/src/widgets/kernel/qshortcut.cpp +++ b/src/widgets/kernel/qshortcut.cpp @@ -545,7 +545,7 @@ QShortcut::QShortcut(QWidget *parent) match the \a key sequence. Depending on the ambiguity of the event, the shortcut will call the \a member function, or the \a ambiguousMember function, if the key press was in the shortcut's - \a context. + \a shortcutContext. */ QShortcut::QShortcut(const QKeySequence &key, QWidget *parent, const char *member, const char *ambiguousMember, diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 954b00eb35..b85bb62917 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -5957,9 +5957,9 @@ void QWidget::setWindowTitle(const QString &title) \note On \macos, window icons represent the active document, and will not be displayed unless a file path has also been - set using setFilePath. + set using setWindowFilePath. - \sa windowTitle, setFilePath + \sa windowTitle, setWindowFilePath */ QIcon QWidget::windowIcon() const { -- cgit v1.2.3