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 /src/qml/types | |
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 'src/qml/types')
-rw-r--r-- | src/qml/types/qqmlconnections.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 8 | ||||
-rw-r--r-- | src/qml/types/qqmlinstantiator.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 4 | ||||
-rw-r--r-- | src/qml/types/qqmlobjectmodel.cpp | 4 | ||||
-rw-r--r-- | src/qml/types/qqmltimer.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qquickpackage.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp index 2ae3df6ebb..183bb1bf74 100644 --- a/src/qml/types/qqmlconnections.cpp +++ b/src/qml/types/qqmlconnections.cpp @@ -75,7 +75,7 @@ public: \instantiates QQmlConnections \inqmlmodule QtQml \ingroup qtquick-interceptors - \brief Describes generalized connections to signals + \brief Describes generalized connections to signals. A Connections object creates a connection to a QML signal. diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 33fe5f3438..62ccf0d66c 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -164,7 +164,7 @@ QQmlDelegateModelParts::QQmlDelegateModelParts(QQmlDelegateModel *parent) \instantiates QQmlDelegateModel \inqmlmodule QtQuick \ingroup qtquick-models - \brief Encapsulates a model and delegate + \brief Encapsulates a model and delegate. The VisualDataModel type encapsulates a model and the delegate that will be instantiated for items in a model. @@ -179,7 +179,7 @@ QQmlDelegateModelParts::QQmlDelegateModelParts(QQmlDelegateModel *parent) \qmltype DelegateModel \instantiates QQmlDelegateModel \inqmlmodule QtQml.Models - \brief Encapsulates a model and delegate + \brief Encapsulates a model and delegate. The DelegateModel type encapsulates a model and the delegate that will be instantiated for items in the model. @@ -2369,7 +2369,7 @@ void QQmlDelegateModelGroupPrivate::destroyingPackage(QQuickPackage *package) \instantiates QQmlDelegateModelGroup \inqmlmodule QtQuick \ingroup qtquick-models - \brief Encapsulates a filtered set of visual data items + \brief Encapsulates a filtered set of visual data items. The VisualDataGroup type provides a means to address the model data of a model's delegate items, as well as sort and filter these delegate items. @@ -2385,7 +2385,7 @@ void QQmlDelegateModelGroupPrivate::destroyingPackage(QQuickPackage *package) \instantiates QQmlDelegateModelGroup \inqmlmodule QtQml.Models \ingroup qtquick-models - \brief Encapsulates a filtered set of visual data items + \brief Encapsulates a filtered set of visual data items. The DelegateModelGroup type provides a means to address the model data of a DelegateModel's delegate items, as well as sort and filter these delegate diff --git a/src/qml/types/qqmlinstantiator.cpp b/src/qml/types/qqmlinstantiator.cpp index 030758fa3b..a23ec0f2b4 100644 --- a/src/qml/types/qqmlinstantiator.cpp +++ b/src/qml/types/qqmlinstantiator.cpp @@ -221,7 +221,7 @@ void QQmlInstantiatorPrivate::makeModel() \qmltype Instantiator \instantiates QQmlInstantiator \inqmlmodule QtQml - \brief Dynamically creates objects + \brief Dynamically creates objects. A Instantiator can be used to control the dynamic creation of objects, or to dynamically create multiple objects from a template. diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index b4507cb264..0a9540bf4b 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -1791,7 +1791,7 @@ void DynamicRoleModelNodeMetaObject::propertyWritten(int index) \instantiates QQmlListModel \inqmlmodule QtQml.Models \ingroup qtquick-models - \brief Defines a free-form list data source + \brief Defines a free-form list data source. The ListModel is a simple container of ListElement definitions, each containing data roles. The contents can be defined dynamically, or @@ -2828,7 +2828,7 @@ bool QQmlListModelParser::definesEmptyList(const QString &s) \qmltype ListElement \instantiates QQmlListElement \inqmlmodule QtQml.Models - \brief Defines a data item in a ListModel + \brief Defines a data item in a ListModel. \ingroup qtquick-models List elements are defined inside ListModel definitions, and represent items in a diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp index 08740b4a6f..d94af64fde 100644 --- a/src/qml/types/qqmlobjectmodel.cpp +++ b/src/qml/types/qqmlobjectmodel.cpp @@ -176,7 +176,7 @@ public: \instantiates QQmlObjectModel \inqmlmodule QtQml.Models \ingroup qtquick-models - \brief Defines a set of items to be used as a model + \brief Defines a set of items to be used as a model. An ObjectModel contains the visual items to be used in a view. When an ObjectModel is used in a view, the view does not require @@ -214,7 +214,7 @@ public: \qmltype VisualItemModel \instantiates QQmlObjectModel \inqmlmodule QtQuick - \brief Defines a set of objects to be used as a model + \brief Defines a set of objects to be used as a model. The VisualItemModel type contains the objects to be used as a model. diff --git a/src/qml/types/qqmltimer.cpp b/src/qml/types/qqmltimer.cpp index 6554010f36..af2ff56f2a 100644 --- a/src/qml/types/qqmltimer.cpp +++ b/src/qml/types/qqmltimer.cpp @@ -87,7 +87,7 @@ public: \instantiates QQmlTimer \inqmlmodule QtQml \ingroup qtquick-interceptors - \brief Triggers a handler at a specified interval + \brief Triggers a handler at a specified interval. A Timer can be used to trigger an action either once, or repeatedly at a given interval. diff --git a/src/qml/types/qquickpackage.cpp b/src/qml/types/qquickpackage.cpp index e8e897bab9..03539d8737 100644 --- a/src/qml/types/qquickpackage.cpp +++ b/src/qml/types/qquickpackage.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \instantiates QQuickPackage \inqmlmodule QtQuick \ingroup qtquick-views - \brief Specifies a collection of named items + \brief Specifies a collection of named items. The Package type is used in conjunction with DelegateModel to enable delegates with a shared context diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index 501de392e3..f8879160b2 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -578,7 +578,7 @@ void QQuickWorkerScriptEngine::run() \instantiates QQuickWorkerScript \ingroup qtquick-threading \inqmlmodule QtQuick - \brief Enables the use of threads in a Qt Quick application + \brief Enables the use of threads in a Qt Quick application. Use WorkerScript to run operations in a new thread. This is useful for running operations in the background so |