diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
tree | 18e22092c2764fea16442fd814f230d4fe095a49 /examples | |
parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'examples')
10 files changed, 19 insertions, 23 deletions
diff --git a/examples/qml/doc/src/qml-extending.qdoc b/examples/qml/doc/src/qml-extending.qdoc index 30c074d765..e56dd90dd7 100644 --- a/examples/qml/doc/src/qml-extending.qdoc +++ b/examples/qml/doc/src/qml-extending.qdoc @@ -28,7 +28,7 @@ /*! \example referenceexamples/adding \title Extending QML - Adding Types Example -\brief Exporting C++ Classes +\brief Exporting C++ Classes. \ingroup qmlextendingexamples The Adding Types Example shows how to add a new object type, \c Person, to QML. @@ -65,7 +65,7 @@ loads and runs the QML snippet shown at the beginning of this page. /*! \example referenceexamples/extended \title Extending QML - Extension Objects Example -\brief Extension Objects +\brief Extension Objects. \ingroup qmlextendingexamples This example builds on: @@ -96,7 +96,7 @@ not be accessible to the QML engine. /*! \example referenceexamples/properties \title Extending QML - Object and List Property Types Example -\brief Exporting C++ Properties +\brief Exporting C++ Properties. \ingroup qmlextendingexamples This example builds on: @@ -146,7 +146,7 @@ loads and runs the QML snippet shown at the beginning of this page. /*! \example referenceexamples/coercion \title Extending QML - Inheritance and Coercion Example -\brief C++ Inheritance and Coercion +\brief C++ Inheritance and Coercion. \ingroup qmlextendingexamples This example builds on: @@ -211,7 +211,7 @@ loads and runs the QML snippet shown at the beginning of this page. /*! \example referenceexamples/default \title Extending QML - Default Property Example -\brief Default Property +\brief Default Property. \ingroup qmlextendingexamples This example builds on: @@ -249,7 +249,7 @@ loads and runs the QML snippet shown at the beginning of this page. /*! \example referenceexamples/grouped \title Extending QML - Grouped Properties Example -\brief Grouped Properties +\brief Grouped Properties. \ingroup qmlextendingexamples This example builds on: @@ -265,7 +265,7 @@ This example builds on: /*! \example referenceexamples/attached \title Extending QML - Attached Properties Example -\brief Attached Properties +\brief Attached Properties. \ingroup qmlextendingexamples This example builds on: @@ -282,7 +282,7 @@ This example builds on: /*! \example referenceexamples/signal \title Extending QML - Signal Support Example -\brief Signal Support +\brief Signal Support. \ingroup qmlextendingexamples This example builds on: @@ -300,7 +300,7 @@ This example builds on: /*! \example referenceexamples/methods \title Extending QML - Methods Example -\brief Methods Support +\brief Methods Support. \ingroup qmlextendingexamples This example builds on: @@ -324,7 +324,7 @@ In \c example.qml, the \c invite() method is called in the \l [QML]{QtQml::Compo /*! \example referenceexamples/valuesource \title Extending QML - Property Value Source Example -\brief Property Value Source +\brief Property Value Source. \ingroup qmlextendingexamples This example builds on: @@ -343,7 +343,7 @@ This example builds on: /*! \example referenceexamples/binding \title Extending QML - Binding Example -\brief Binding +\brief Binding. \ingroup qmlextendingexamples This example builds on: diff --git a/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc b/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc index f68ce138dc..443647c80b 100644 --- a/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc +++ b/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc @@ -28,7 +28,7 @@ /*! \example networkaccessmanagerfactory \title C++ Extensions: Network Access Manager Factory Example - \brief Implements a custom network access manager for the QML engine + \brief Implements a custom network access manager for the QML engine. This example shows how to use QQmlNetworkAccessManagerFactory to create a QNetworkAccessManager with a proxy. diff --git a/examples/qml/qml-i18n/doc/src/i18n.qdoc b/examples/qml/qml-i18n/doc/src/i18n.qdoc index e0ef452e52..dbc4efa58c 100644 --- a/examples/qml/qml-i18n/doc/src/i18n.qdoc +++ b/examples/qml/qml-i18n/doc/src/i18n.qdoc @@ -28,7 +28,7 @@ \title QML Examples - Internationalization \example qml-i18n \image qml-i18n-example.png - \brief This is an internationalization example + \brief This is an internationalization example. The QML runtime automatically loads a translation from the i18n subdirectory of the root QML file, based on the system language. diff --git a/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc index 3d215c66c3..752836e524 100644 --- a/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc +++ b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc @@ -27,7 +27,7 @@ /*! \title Qt Quick Examples - XMLHttpRequest \example xmlhttprequest - \brief This is a collection of XMLHttpRequest examples + \brief This is a collection of XMLHttpRequest examples. \image qml-xmlhttprequest-example.png \e XMLHttpRequest contains a small QML example demonstrating \l{Qt QML}'s diff --git a/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc b/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc index 5b9e2f5c9f..a45c8107cb 100644 --- a/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc +++ b/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc @@ -29,7 +29,7 @@ \title TabWidget Example \example customitems/tabwidget \brief The TabWidget example shows how to create a tabwidget using property aliases - and QML Object default properties + and QML Object default properties. This example shows how to create a tab widget. It also demonstrates how \l {Property aliases}{property aliases} and diff --git a/examples/quick/draganddrop/doc/src/draganddrop.qdoc b/examples/quick/draganddrop/doc/src/draganddrop.qdoc index 437ed687a3..b740582cc4 100644 --- a/examples/quick/draganddrop/doc/src/draganddrop.qdoc +++ b/examples/quick/draganddrop/doc/src/draganddrop.qdoc @@ -27,7 +27,7 @@ /*! \title Qt Quick Examples - Drag and Drop \example draganddrop - \brief This is a collection of QML drag and drop examples + \brief This is a collection of QML drag and drop examples. \image qml-draganddrop-example.png \ingroup qtquickexamples diff --git a/examples/quick/imageprovider/imageprovider.cpp b/examples/quick/imageprovider/imageprovider.cpp index 662bd8bb70..2d927ea79a 100644 --- a/examples/quick/imageprovider/imageprovider.cpp +++ b/examples/quick/imageprovider/imageprovider.cpp @@ -56,7 +56,6 @@ #include <QImage> #include <QPainter> -//![0] class ColorImageProvider : public QQuickImageProvider { public: @@ -75,7 +74,6 @@ public: QPixmap pixmap(requestedSize.width() > 0 ? requestedSize.width() : width, requestedSize.height() > 0 ? requestedSize.height() : height); pixmap.fill(QColor(id).rgba()); -//![0] // write the color name QPainter painter(&pixmap); @@ -87,11 +85,9 @@ public: painter.scale(requestedSize.width() / width, requestedSize.height() / height); painter.drawText(QRectF(0, 0, width, height), Qt::AlignCenter, id); -//![1] return pixmap; } }; -//![1] class ImageProviderExtensionPlugin : public QQmlExtensionPlugin diff --git a/examples/quick/layouts/doc/src/qtquicklayouts-examples.qdoc b/examples/quick/layouts/doc/src/qtquicklayouts-examples.qdoc index b2c91e05bb..deb1d62b2b 100644 --- a/examples/quick/layouts/doc/src/qtquicklayouts-examples.qdoc +++ b/examples/quick/layouts/doc/src/qtquicklayouts-examples.qdoc @@ -27,7 +27,7 @@ /*! \title Qt Quick Layouts - Basic Example \example layouts - \brief Demonstrates how to use layout types to arrange a UI + \brief Demonstrates how to use layout types to arrange a UI. \image qtquicklayouts-example-layouts.png \ingroup qtquickexamples diff --git a/examples/quick/rendercontrol/doc/src/rendercontrol.qdoc b/examples/quick/rendercontrol/doc/src/rendercontrol.qdoc index 33c0a6712d..026a6f5a09 100644 --- a/examples/quick/rendercontrol/doc/src/rendercontrol.qdoc +++ b/examples/quick/rendercontrol/doc/src/rendercontrol.qdoc @@ -28,6 +28,6 @@ /*! \title QQuickRenderControl Example \example rendercontrol - \brief Shows how to render a Qt Quick scene into a texture that is then used by a non-Quick based OpenGL renderer + \brief Shows how to render a Qt Quick scene into a texture that is then used by a non-Quick based OpenGL renderer. \image rendercontrol-example.jpg */ diff --git a/examples/quick/window/doc/src/window.qdoc b/examples/quick/window/doc/src/window.qdoc index 207321f762..26caafce9a 100644 --- a/examples/quick/window/doc/src/window.qdoc +++ b/examples/quick/window/doc/src/window.qdoc @@ -27,7 +27,7 @@ /*! \title Qt Quick Examples - Window and Screen \example window - \brief This example demonstrates the Window and Screen types in QML + \brief This example demonstrates the Window and Screen types in QML. \image qml-window-example.png \ingroup qtquickexamples |