diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:26 +0100 |
| commit | ff466a1881435f927f5df9ce1e5eac07d5591904 (patch) | |
| tree | 760e068743e6a8e1cc4ec63bb2f8e7dcef88b3e2 /src/qml/types | |
| parent | e04822f3c2a6b69b7d75e2039256aa2433c59dd2 (diff) | |
| parent | 4a3f6e58b591f2fe2204f7cbc1efc8abb0aade74 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4globalobject.cpp
src/qml/jsruntime/qv4internalclass.cpp
src/quick/items/qquicktext_p.h
src/quick/items/qquicktextedit_p.h
src/quick/items/qquicktextinput_p.h
Change-Id: If07e483e03197cb997ef47a9c647a479cdb09f4c
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 4 | ||||
| -rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 4 | ||||
| -rw-r--r-- | src/qml/types/qqmlobjectmodel.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index fcbf474008..6e2e51b493 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -174,7 +174,7 @@ QQmlDelegateModelParts::QQmlDelegateModelParts(QQmlDelegateModel *parent) /*! \qmltype DelegateModel \instantiates QQmlDelegateModel - \inqmlmodule QtQml.Models 2 + \inqmlmodule QtQml.Models \brief Encapsulates a model and delegate The DelegateModel type encapsulates a model and the delegate that will @@ -2307,7 +2307,7 @@ void QQmlDelegateModelGroupPrivate::destroyingPackage(QQuickPackage *package) /*! \qmltype DelegateModelGroup \instantiates QQmlDelegateModelGroup - \inqmlmodule QtQml.Models 2 + \inqmlmodule QtQml.Models \ingroup qtquick-models \brief Encapsulates a filtered set of visual data items diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index 142625d7ae..afd887ba53 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -1436,7 +1436,7 @@ void DynamicRoleModelNodeMetaObject::propertyWritten(int index) /*! \qmltype ListModel \instantiates QQmlListModel - \inqmlmodule QtQml.Models 2 + \inqmlmodule QtQml.Models \ingroup qtquick-models \brief Defines a free-form list data source @@ -2447,7 +2447,7 @@ bool QQmlListModelParser::definesEmptyList(const QString &s) /*! \qmltype ListElement \instantiates QQmlListElement - \inqmlmodule QtQml.Models 2 + \inqmlmodule QtQml.Models \brief Defines a data item in a ListModel \ingroup qtquick-models diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp index d2f47c41b2..7c1a951a2b 100644 --- a/src/qml/types/qqmlobjectmodel.cpp +++ b/src/qml/types/qqmlobjectmodel.cpp @@ -123,7 +123,7 @@ public: /*! \qmltype ObjectModel \instantiates QQmlObjectModel - \inqmlmodule QtQml.Models 2 + \inqmlmodule QtQml.Models \ingroup qtquick-models \brief Defines a set of items to be used as a model |