diff options
| author | Erik Verbruggen <erik.verbruggen@qt.io> | 2018-10-12 12:13:45 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2019-04-16 08:37:22 +0000 |
| commit | 398d586a59e768f6e442fdc912d9180df71ff374 (patch) | |
| tree | dd835351f4bb706047da993edacfd8c790d1e63f /src/qml/qml | |
| parent | 5fcc9906d7b6d19ea3d79ccf0d6446d01b583973 (diff) | |
QML: Allow fetchOrCreateTypeForUrl to report errors without qFatal
Because qFatal will abort() the program.
Task-number: QTBUG-71116
Change-Id: Ifd6be996cfbd6fff8e75ad2b26682c34f837ac88
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index a79d4d074c..5a1364473e 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -867,7 +867,7 @@ bool QQmlImportInstance::resolveType(QQmlTypeLoader *typeLoader, const QHashedSt *typeRecursionDetected = true; } else { QQmlType returnType = fetchOrCreateTypeForUrl( - qmlUrl, type, registrationType == QQmlType::CompositeSingletonType, nullptr); + qmlUrl, type, registrationType == QQmlType::CompositeSingletonType, errors); if (type_return) *type_return = returnType; return returnType.isValid(); |