diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/gui/doc/src/rasterwindow.qdoc | 2 | ||||
| -rw-r--r-- | examples/sql/doc/src/masterdetail.qdoc | 2 | ||||
| -rw-r--r-- | examples/sql/masterdetail/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | examples/widgets/doc/images/completer-example-dirmodel.png | bin | 0 -> 14389 bytes | |||
| -rw-r--r-- | examples/widgets/doc/images/completer-example-qdirmodel.png | bin | 0 -> 13896 bytes | |||
| -rw-r--r-- | examples/widgets/doc/src/application.qdoc | 4 | ||||
| -rw-r--r-- | examples/widgets/doc/src/completer.qdoc | 2 | ||||
| -rw-r--r-- | examples/widgets/doc/src/dockwidgets.qdoc | 4 | ||||
| -rw-r--r-- | examples/widgets/doc/src/regexp.qdoc | 2 | ||||
| -rw-r--r-- | examples/widgets/doc/src/styles.qdoc | 2 | ||||
| -rw-r--r-- | examples/xml/htmlinfo/main.cpp | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/examples/gui/doc/src/rasterwindow.qdoc b/examples/gui/doc/src/rasterwindow.qdoc index 152a60e180..61843f2248 100644 --- a/examples/gui/doc/src/rasterwindow.qdoc +++ b/examples/gui/doc/src/rasterwindow.qdoc @@ -54,7 +54,7 @@ \snippet rasterwindow/rasterwindow.h 1 - We first start by including the QtGui headers. This means we + We first start by including the \c <QtGui> header. This means we can use all classes in the Qt GUI module. Classes can also be included individually if that is preferred. diff --git a/examples/sql/doc/src/masterdetail.qdoc b/examples/sql/doc/src/masterdetail.qdoc index da57a16d35..abf2624844 100644 --- a/examples/sql/doc/src/masterdetail.qdoc +++ b/examples/sql/doc/src/masterdetail.qdoc @@ -38,7 +38,7 @@ The example also shows how to add as well as remove data from both the database and the associated XML file using the API provided by - the QtSql and QtXml modules, respectively. + the Qt SQL and Qt XML modules, respectively. \image masterdetail-example.png */ diff --git a/examples/sql/masterdetail/mainwindow.cpp b/examples/sql/masterdetail/mainwindow.cpp index ce45ddb9e6..f3bd194c31 100644 --- a/examples/sql/masterdetail/mainwindow.cpp +++ b/examples/sql/masterdetail/mainwindow.cpp @@ -424,6 +424,6 @@ void MainWindow::about() "are kept in a database, while each album's tracks are stored " "in an XML file. </p><p>The example also shows how to add as " "well as remove data from both the database and the " - "associated XML file using the API provided by the QtSql and " - "QtXml modules, respectively.</p>")); + "associated XML file using the API provided by the Qt SQL and " + "Qt XML modules, respectively.</p>")); } diff --git a/examples/widgets/doc/images/completer-example-dirmodel.png b/examples/widgets/doc/images/completer-example-dirmodel.png Binary files differnew file mode 100644 index 0000000000..94b75b0795 --- /dev/null +++ b/examples/widgets/doc/images/completer-example-dirmodel.png diff --git a/examples/widgets/doc/images/completer-example-qdirmodel.png b/examples/widgets/doc/images/completer-example-qdirmodel.png Binary files differnew file mode 100644 index 0000000000..904c198792 --- /dev/null +++ b/examples/widgets/doc/images/completer-example-qdirmodel.png diff --git a/examples/widgets/doc/src/application.qdoc b/examples/widgets/doc/src/application.qdoc index 146852001a..0d244bce00 100644 --- a/examples/widgets/doc/src/application.qdoc +++ b/examples/widgets/doc/src/application.qdoc @@ -76,8 +76,8 @@ \snippet mainwindows/application/mainwindow.cpp 0 We start by including \c <QtGui>, a header file that contains the - definition of all classes in the \l QtCore and \l QtGui - libraries. This saves us from the trouble of having to include + definition of all classes in the Qt Core and Qt GUI + modules. This saves us from the trouble of having to include every class individually. We also include \c mainwindow.h. You might wonder why we don't include \c <QtGui> in \c diff --git a/examples/widgets/doc/src/completer.qdoc b/examples/widgets/doc/src/completer.qdoc index d74e19f28b..dcb15d2ef8 100644 --- a/examples/widgets/doc/src/completer.qdoc +++ b/examples/widgets/doc/src/completer.qdoc @@ -28,7 +28,7 @@ /*! \example tools/completer \title Completer Example - \ingroup example-widgets-tools + \ingroup examples-widgets-tools \brief The Completer example shows how to provide string-completion facilities for an input widget based on data provided by a model. diff --git a/examples/widgets/doc/src/dockwidgets.qdoc b/examples/widgets/doc/src/dockwidgets.qdoc index 6a6e9da417..7f08572a30 100644 --- a/examples/widgets/doc/src/dockwidgets.qdoc +++ b/examples/widgets/doc/src/dockwidgets.qdoc @@ -56,8 +56,8 @@ \snippet mainwindows/dockwidgets/mainwindow.cpp 0 We start by including \c <QtGui>, a header file that contains the - definition of all classes in the \l QtCore and \l QtGui - libraries. This saves us from having to include + definition of all classes in the Qt Core and Qt GUI + modules. This saves us from having to include every class individually and is especially convenient if we add new widgets. We also include \c mainwindow.h. diff --git a/examples/widgets/doc/src/regexp.qdoc b/examples/widgets/doc/src/regexp.qdoc index 562075cace..9dc3878c10 100644 --- a/examples/widgets/doc/src/regexp.qdoc +++ b/examples/widgets/doc/src/regexp.qdoc @@ -28,7 +28,7 @@ /*! \example tools/regexp \title Regular Expressions Example - \ingroup example-widgets-tools + \ingroup examples-widgets-tools \brief The Regular Expressions (RegExp) example shows how regular expressions in Qt are applied to text by providing an environment in which new regular expressions can be diff --git a/examples/widgets/doc/src/styles.qdoc b/examples/widgets/doc/src/styles.qdoc index 3ec745b3cc..53c0665b3d 100644 --- a/examples/widgets/doc/src/styles.qdoc +++ b/examples/widgets/doc/src/styles.qdoc @@ -37,7 +37,7 @@ A style in Qt is a subclass of QStyle or of one of its subclasses. Styles perform drawing on behalf of widgets. Qt provides a whole range of predefined styles, either built into - the \l QtWidgets library or found in plugins. Styles are usually + the Qt Widgets module or found in plugins. Styles are usually customized by subclassing QProxyStyle and reimplementing a few virtual functions. While QProxyStyle provides a transparent way to customize either a specific style or the appropriate platform's diff --git a/examples/xml/htmlinfo/main.cpp b/examples/xml/htmlinfo/main.cpp index be40e670bf..7179e8221b 100644 --- a/examples/xml/htmlinfo/main.cpp +++ b/examples/xml/htmlinfo/main.cpp @@ -94,7 +94,7 @@ void parseHtmlFile(QTextStream &out, const QString &fileName) { int main(int argc, char **argv) { - // initialize QtCore application + // initialize Qt Core application QCoreApplication app(argc, argv); // get a list of all html files in the current directory |
