diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-06 19:27:27 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-06 19:30:25 +0200 |
commit | 0af2998cc99e90e3df34f794801340d8a769c735 (patch) | |
tree | 61e40f82c8ebf6e843f691c085644aa65180247d /src/qml/compiler/qqmltypecompiler.cpp | |
parent | f07f1e399d5e13671f2f2ef4c55b1e6a1bc37e3b (diff) | |
parent | 32218c3243fb4f0da83293c5bd6a663d8e3660ee (diff) |
Merge remote-tracking branch 'origin/5.9.2' into 5.9
Change-Id: Iddce38c1d6cb51e7cccedaff165e21b60d7a85b2
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler.cpp')
-rw-r--r-- | src/qml/compiler/qqmltypecompiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp index eeb5595a9a..fab865081a 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/compiler/qqmltypecompiler.cpp @@ -412,7 +412,7 @@ bool SignalHandlerConverter::convertSignalHandlerExpressionsToFunctionDeclaratio const QString &originalPropertyName = stringAt(binding->propertyNameIndex); auto *typeRef = resolvedTypes.value(obj->inheritedTypeNameIndex); - const QQmlType type = typeRef->type; + const QQmlType type = typeRef ? typeRef->type : QQmlType(); if (type.isValid()) { COMPILE_EXCEPTION(binding, tr("\"%1.%2\" is not available in %3 %4.%5.").arg(typeName).arg(originalPropertyName).arg(type.module()).arg(type.majorVersion()).arg(type.minorVersion())); } else { |