diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-02 01:01:02 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-02 01:01:02 +0200 |
| commit | a6f389bd7a6f47cb5246e82518989faf59c46349 (patch) | |
| tree | 142750231b88b77c0a46cb6f787ee94a4dca4a99 /src/qml | |
| parent | a4aa8d9ade44d75cb5a1d84bd7c1773fadc73095 (diff) | |
| parent | f529d38103a6c1c5c7b76ad92e0e5641719e369e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ie250bf60cc934de765b105b477c2cc7ebcb3380d
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc | 5 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertyvalidator.cpp | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc index 0faad43f4f..f7d71030b5 100644 --- a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc +++ b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc @@ -479,10 +479,7 @@ Module { Enum { name: "Loops" - values: { - "Infinite": -2, - "OnceOnly": 1 - } + values: [ "Infinite", "OnceOnly" ] } // Signal and Method work the same way. The inner Parameter diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp index 6959b05105..d7361ea2c6 100644 --- a/src/qml/qml/qqmlpropertyvalidator.cpp +++ b/src/qml/qml/qqmlpropertyvalidator.cpp @@ -727,7 +727,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateObjectBinding(QQmlPrope } else if (binding->flags & QV4::CompiledData::Binding::IsSignalHandlerObject && property->isFunction()) { return noError; } else if (isPrimitiveType(propType)) { - auto typeName = QMetaType::typeName(propType); + auto typeName = QString::fromUtf8(QMetaType::typeName(propType)); return qQmlCompileError(binding->location, tr("Can not assign value of type \"%1\" to property \"%2\", expecting \"%3\"") .arg(rhsType()) .arg(propertyName) |