diff options
-rw-r--r-- | src/assistant/assistant/assistant.pro | 2 | ||||
-rw-r--r-- | src/assistant/help/qhelpsearchengine.cpp | 2 | ||||
-rw-r--r-- | src/qdoc/doc/examples/componentset/ProgressBar.qml | 2 | ||||
-rw-r--r-- | src/qdoc/doc/examples/componentset/Switch.qml | 2 | ||||
-rw-r--r-- | src/qdoc/doc/examples/componentset/TabWidget.qml | 2 | ||||
-rw-r--r-- | src/qdoc/doc/qdoc-manual-markupcmds.qdoc | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro index 1374c0738..080aba03f 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -4,7 +4,7 @@ qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { BROWSER = qtextbrowser } -QT += widgets network help sql help +QT += widgets network help sql qtHaveModule(printsupport): QT += printsupport PROJECTNAME = Assistant diff --git a/src/assistant/help/qhelpsearchengine.cpp b/src/assistant/help/qhelpsearchengine.cpp index 6e6f8b777..3ee9904e2 100644 --- a/src/assistant/help/qhelpsearchengine.cpp +++ b/src/assistant/help/qhelpsearchengine.cpp @@ -276,7 +276,7 @@ private: \since 4.4 \inmodule QtHelp \brief The QHelpSearchQuery class contains the field name and the associated - search term + search term. The QHelpSearchQuery class contains the field name and the associated search term. Depending on the field the search term might get split up into separate diff --git a/src/qdoc/doc/examples/componentset/ProgressBar.qml b/src/qdoc/doc/examples/componentset/ProgressBar.qml index 45a0edc46..2a40cc488 100644 --- a/src/qdoc/doc/examples/componentset/ProgressBar.qml +++ b/src/qdoc/doc/examples/componentset/ProgressBar.qml @@ -53,7 +53,7 @@ import QtQuick 1.0 /*! \qmltype ProgressBar \inqmlmodule UIComponents - \brief A component that shows the progress of an event + \brief A component that shows the progress of an event. A ProgressBar shows the linear progress of an event as its \l value. The range is specified using the \l {minimum} and the \l{maximum} values. diff --git a/src/qdoc/doc/examples/componentset/Switch.qml b/src/qdoc/doc/examples/componentset/Switch.qml index 3158ec8ae..db9616b69 100644 --- a/src/qdoc/doc/examples/componentset/Switch.qml +++ b/src/qdoc/doc/examples/componentset/Switch.qml @@ -53,7 +53,7 @@ import QtQuick 1.0 /*! \qmltype ToggleSwitch \inqmlmodule UIComponents - \brief A component that can be turned on or off + \brief A component that can be turned on or off. A toggle switch has two states: an \c on and an \c off state. The \c off state is when the \l on property is set to \c false. diff --git a/src/qdoc/doc/examples/componentset/TabWidget.qml b/src/qdoc/doc/examples/componentset/TabWidget.qml index 588f7ebe1..07fd40db9 100644 --- a/src/qdoc/doc/examples/componentset/TabWidget.qml +++ b/src/qdoc/doc/examples/componentset/TabWidget.qml @@ -53,7 +53,7 @@ import QtQuick 1.0 /*! \qmltype TabWidget \inqmlmodule UIComponents - \brief A widget that places its children as tabs + \brief A widget that places its children as tabs. A TabWidget places its children as tabs in a view. Selecting a tab involves selecting the tab at the top. diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc index 618e5cc54..968445d86 100644 --- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc @@ -2999,7 +2999,7 @@ \code / *! \property QWidget::isActiveWindow - \brief Whether this widget's window is the active window + \brief Whether this widget's window is the active window. The active window is the window that contains the widget that has keyboard focus. @@ -3017,7 +3017,7 @@ / *! \property QWidget::geometry \brief The geometry of the widget relative to its parent and - excluding the window frame + excluding the window frame. When changing the geometry, the widget, if visible, receives a move event (moveEvent()) and/or a resize |