diff options
| -rw-r--r-- | src/qml/qml/qqmlincubator.cpp | 3 | ||||
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlincubator/data/objectDeleted.errors.txt | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp index e18ce71902..39da550d63 100644 --- a/src/qml/qml/qqmlincubator.cpp +++ b/src/qml/qml/qqmlincubator.cpp @@ -282,8 +282,9 @@ void QQmlIncubatorPrivate::incubate(QQmlInstantiationInterrupt &i) if (!vmeGuard.isOK()) { QQmlError error; + error.setMessageType(QtInfoMsg); error.setUrl(compilationUnit->url()); - error.setDescription(QQmlComponent::tr("Object destroyed during incubation")); + error.setDescription(QQmlComponent::tr("Object or context destroyed during incubation")); errors << error; progress = QQmlIncubatorPrivate::Completed; diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 2b9a45c142..f6bf4a6647 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -956,7 +956,7 @@ void QQmlDelegateModelPrivate::incubatorStatusChanged(QQDMIncubationTask *incuba emitCreatedItem(incubationTask, cacheItem->object); cacheItem->releaseObject(); } else if (status == QQmlIncubator::Error) { - qmlWarning(m_delegate, incubationTaskErrors + m_delegate->errors()) << "Error creating delegate"; + qmlInfo(m_delegate, incubationTaskErrors + m_delegate->errors()) << "Cannot create delegate"; } if (!cacheItem->isObjectReferenced()) { diff --git a/tests/auto/qml/qqmlincubator/data/objectDeleted.errors.txt b/tests/auto/qml/qqmlincubator/data/objectDeleted.errors.txt index eeda289d35..9f972e3e06 100644 --- a/tests/auto/qml/qqmlincubator/data/objectDeleted.errors.txt +++ b/tests/auto/qml/qqmlincubator/data/objectDeleted.errors.txt @@ -1 +1 @@ --1:-1:Object destroyed during incubation +-1:-1:Object or context destroyed during incubation |