diff options
-rw-r--r-- | examples/widgets/tools/settingseditor/locationdialog.cpp | 1 | ||||
-rw-r--r-- | src/corelib/io/qsettings.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qaction.cpp | 6 | ||||
-rw-r--r-- | src/widgets/doc/qtwidgets.qdocconf | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qmainwindow.cpp | 3 | ||||
-rw-r--r-- | src/widgets/widgets/qplaintextedit.cpp | 1 |
6 files changed, 4 insertions, 13 deletions
diff --git a/examples/widgets/tools/settingseditor/locationdialog.cpp b/examples/widgets/tools/settingseditor/locationdialog.cpp index cef83c0e49..1c41d45009 100644 --- a/examples/widgets/tools/settingseditor/locationdialog.cpp +++ b/examples/widgets/tools/settingseditor/locationdialog.cpp @@ -33,7 +33,6 @@ LocationDialog::LocationDialog(QWidget *parent) applicationComboBox = new QComboBox; applicationComboBox->addItem(tr("Any")); applicationComboBox->addItem(tr("Qt Creator")); - applicationComboBox->addItem(tr("Application Example")); applicationComboBox->addItem(tr("Assistant")); applicationComboBox->addItem(tr("Designer")); applicationComboBox->addItem(tr("Linguist")); diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 133777f4a2..b8ebed7208 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -2340,7 +2340,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, \endlist - \sa QVariant, QSessionManager, {Settings Editor Example}, {Qt Widgets - Application Example} + \sa QVariant, QSessionManager, {Settings Editor Example} */ /*! \enum QSettings::Status diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index dccdb1ac3e..c67cfd53b1 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -171,9 +171,7 @@ QObject *QActionPrivate::menu() const Once a QAction has been created, it should be added to the relevant menu and toolbar, then connected to the slot which will perform - the action. For example: - - \snippet ../widgets/mainwindows/mdi/mainwindow.cpp qaction setup + the action. Actions are added to widgets using QWidget::addAction() or QGraphicsWidget::addAction(). Note that an action must be added to a @@ -186,7 +184,7 @@ QObject *QActionPrivate::menu() const use as menu items. - \sa QMenu, QToolBar, {Qt Widgets - Application Example} + \sa QMenu, QToolBar */ /*! diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf index a63a2f5f2d..d5f0809c8a 100644 --- a/src/widgets/doc/qtwidgets.qdocconf +++ b/src/widgets/doc/qtwidgets.qdocconf @@ -60,7 +60,3 @@ imagedirs += images \ navigation.landingpage = "Qt Widgets" navigation.cppclassespage = "Qt Widgets C++ Classes" -manifestmeta.highlighted.names = "QtWidgets/Qt Widgets - Application Example" - -# Fail the documentation build if there are more warnings than the limit -warninglimit = 0 diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index 19ee3b7812..fcf6d56c0c 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -280,8 +280,7 @@ void QMainWindowPrivate::init() is the position and size (relative to the size of the main window) of the toolbars and dock widgets that are stored. - \sa QMenuBar, QToolBar, QStatusBar, QDockWidget, - {MDI Example}, {Menus Example} + \sa QMenuBar, QToolBar, QStatusBar, QDockWidget, {Menus Example} */ /*! diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index 637ed5fe92..f339d1db0d 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -1186,7 +1186,6 @@ void QPlainTextEditPrivate::ensureViewportLayouted() editor with line wrap enabled in real time. It also makes for a fast log viewer (see setMaximumBlockCount()). - \sa QTextDocument, QTextCursor {Syntax Highlighter Example}, {Rich Text Processing} |