diff --git a/examples/widgets/doc/src/tetrix.qdoc b/examples/widgets/doc/src/tetrix.qdoc index f74d3c14d50d290b8bfe2e68a0fdbf29f5e751c6..6050fe2356ea0d00134da723840a31b9e6556b8c 100644 --- a/examples/widgets/doc/src/tetrix.qdoc +++ b/examples/widgets/doc/src/tetrix.qdoc @@ -108,7 +108,7 @@ We connect \l{QAbstractButton::}{clicked()} signals from the \uicontrol{Start} and \uicontrol{Pause} buttons to the board, and from the \uicontrol{Quit} button to the - application's \l{QApplication::}{quit()} slot. + application's \l{QCoreApplication::quit()} slot. \snippet widgets/tetrix/tetrixwindow.cpp 4 \snippet widgets/tetrix/tetrixwindow.cpp 5 diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index a912e65d30d34b23110b5c6e26e0e9b6fd8d651e..38eb64601d572d806ac619d0dde9d9dac689ff8b 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -772,7 +772,7 @@ \value UI_FadeTooltip Show tooltip fading effects. \value UI_AnimateToolBox Reserved - \sa QApplication::setEffectEnabled(), QApplication::setDesktopSettingsAware() + \sa QApplication::setEffectEnabled(), QGuiApplication::setDesktopSettingsAware() */ /*! \enum Qt::AspectRatioMode @@ -2443,7 +2443,7 @@ When LayoutDirectionAuto is used in conjunction with text layouting, it will imply that the text directionality is determined from the content of the string to be layouted. - \sa QApplication::setLayoutDirection(), QWidget::setLayoutDirection(), QTextOption::setTextDirection(), QString::isRightToLeft() + \sa QGuiApplication::setLayoutDirection(), QWidget::setLayoutDirection(), QTextOption::setTextDirection(), QString::isRightToLeft() */ /*! diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 1a74bab5380adc5a7125db2fa790db0da5a91733..f9ae6138ad96a62c786b20c9ab6c79fc1d951a9b 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -272,7 +272,7 @@ static void stackTrace() The QTRY_VERIFY2_WITH_TIMEOUT macro is similar to QTRY_VERIFY_WITH_TIMEOUT() except that it outputs a verbose \a message when \a condition is still false - after the specified timeout. The \a message is a plain C string. + after the specified \a timeout. The \a message is a plain C string. Example: \code diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp index 95c4877eb98d27a94553e22ac1a28f0c01ca2040..1563d020b6d3aa4a4ef061458b012f802f3bae97 100644 --- a/src/widgets/kernel/qaction.cpp +++ b/src/widgets/kernel/qaction.cpp @@ -1270,7 +1270,7 @@ QAction::MenuRole QAction::menuRole() const For example: \snippet code/src_gui_kernel_qaction.cpp 0 - \sa QAction::icon, QApplication::setAttribute() + \sa QAction::icon, QCoreApplication::setAttribute() */ void QAction::setIconVisibleInMenu(bool visible) { diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index f82fac836a0e57b14f5e42119f4794230611dd67..eaadcd5e2a7d28bd3b22ff9c4431571eab18c0a2 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -558,7 +558,7 @@ void QApplicationPrivate::process_cmdline() and will make the application wait until a debugger connects to it. \endlist - \sa arguments() + \sa QCoreApplication::arguments() */ #ifdef Q_QDOC @@ -1951,7 +1951,7 @@ bool QApplicationPrivate::tryCloseAllWindows() \l quitOnLastWindowClosed to false. \sa quitOnLastWindowClosed, lastWindowClosed(), QWidget::close(), - QWidget::closeEvent(), lastWindowClosed(), quit(), topLevelWidgets(), + QWidget::closeEvent(), lastWindowClosed(), QCoreApplication::quit(), topLevelWidgets(), QWidget::isWindow() */ void QApplication::closeAllWindows() @@ -2969,8 +2969,8 @@ int QApplication::startDragDistance() application will have time to exit its event loop and execute code at the end of the \c{main()} function, after the QApplication::exec() call. - \sa quitOnLastWindowClosed, quit(), exit(), processEvents(), - QCoreApplication::exec() + \sa quitOnLastWindowClosed, QCoreApplication::quit(), QCoreApplication::exit(), + QCoreApplication::processEvents(), QCoreApplication::exec() */ int QApplication::exec() { diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index a7c58ab332b08b012bcbe41f424ddf8c8401f75e..0556c02b6439dccdb73af31f6c452016087b79c5 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1443,7 +1443,7 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) addSeparator(), and addMenu(). \sa QMenuBar, {fowler}{GUI Design Handbook: Menu, Drop-Down and Pop-Up}, - {Application Example}, {Menus Example}, {Recent Files Example} + {Application Example}, {Menus Example} */