aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlcomponent.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-02-12 10:53:43 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-02-12 10:53:43 +0100
commit20a51e87fd15b8a6c1503b905399f7befe31114b (patch)
tree5a8667150568ed798d63eb165372c198549498c2 /src/qml/qml/qqmlcomponent.cpp
parent6c152bf27f94f01b2942b02e370df4fa01e0d40f (diff)
parent084dbb06d7b00c4a67edb6ce58956150036c35f2 (diff)
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts: .qmake.conf Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
-rw-r--r--src/qml/qml/qqmlcomponent.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index b8bd0f7f1d..fbd2d13e40 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -378,6 +378,13 @@ QQmlComponent::~QQmlComponent()
if (d->state.completePending) {
qWarning("QQmlComponent: Component destroyed while completion pending");
+
+ if (isError()) {
+ qWarning() << "This may have been caused by one of the following errors:";
+ foreach (const QQmlError &error, d->state.errors)
+ qWarning().nospace().noquote() << QLatin1String(" ") << error;
+ }
+
d->completeCreate();
}