diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 20:21:34 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 20:21:35 +0100 |
| commit | 268931e742908368a7eab7c16021601bb0a95dc5 (patch) | |
| tree | 3ba9f4fdde1a618c2724878973392b1fe619c7c9 /src/qml/util | |
| parent | cad65e4eb34110a48545bf1fdb2e83d848c5184c (diff) | |
| parent | b733c37522abeb33f2e14f7a8fdefaf15acf42b5 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib297817e2fd9b6790d9bc8ee522c32f5b3422574
Diffstat (limited to 'src/qml/util')
| -rw-r--r-- | src/qml/util/qqmlpropertymap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/util/qqmlpropertymap.cpp b/src/qml/util/qqmlpropertymap.cpp index b54e8d901a..578c05086f 100644 --- a/src/qml/util/qqmlpropertymap.cpp +++ b/src/qml/util/qqmlpropertymap.cpp @@ -355,7 +355,7 @@ QQmlPropertyMap::QQmlPropertyMap(const QMetaObject *staticMetaObject, QObject *p */ /*! - \fn QQmlPropertyMap::QQmlPropertyMap(DerivedType *derived, QObject *parent) + \fn template<class DerivedType> QQmlPropertyMap::QQmlPropertyMap(DerivedType *derived, QObject *parent) Constructs a bindable map with parent object \a parent. Use this constructor in classes derived from QQmlPropertyMap. |