diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-22 14:26:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-02-22 14:26:13 +0100 |
| commit | 3baa2d550512702dfc227aef0af3542ab189824f (patch) | |
| tree | fe2967757ce6abe70f3f819cd8f5691cc384288d /src/qml/qml/qqmlmetatype_p.h | |
| parent | 16aff415a44f5f10c5ac95da72559839305c8ae5 (diff) | |
| parent | 3ad752e1c16a3d37a71c5a7527c7e67cc333cdd2 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
Change-Id: If3bf1abc23a59c458be0bb862d92f2edcb16b79f
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
| -rw-r--r-- | src/qml/qml/qqmlmetatype_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index 2a45ddb4bb..3ad2de7bb3 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -103,7 +103,7 @@ public: static QQmlType qmlType(int typeId, TypeIdCategory category = TypeIdCategory::MetaType); static QQmlType qmlType(const QUrl &unNormalizedUrl, bool includeNonFileImports = false); - static QQmlPropertyCache *propertyCache(const QMetaObject *metaObject); + static QQmlPropertyCache *propertyCache(const QMetaObject *metaObject, int minorVersion = -1); static QQmlPropertyCache *propertyCache(const QQmlType &type, int minorVersion); static void freeUnusedTypesAndCaches(); |