From fd6afba3c37b63410d94f56fddd8640dab73b1c3 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@digia.com>
Date: Thu, 9 Oct 2014 13:35:12 +0200
Subject: [PATCH] QmlDesigner: improve error output of the puppets

 - errors -> warning none false outputs -> debug
 - adding some more error outputs

Change-Id: Ice61d10a87dc5ef789b7913cae166641b18ddf27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 .../instances/componentnodeinstance.cpp       |  2 +-
 .../instances/nodeinstanceserver.cpp          |  4 ++--
 .../instances/objectnodeinstance.cpp          | 19 +++++++++++++++----
 .../instances/objectnodeinstance.cpp          |  6 ++++++
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp
index 220500fc48c..b05132ebc19 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp
@@ -77,7 +77,7 @@ void ComponentNodeInstance::setNodeSource(const QString &source)
 
     if (component()->isError()) {
         foreach (const QQmlError &error, component()->errors())
-            qDebug() << error;
+            qWarning() << error;
     }
 
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
index 5269e07172d..56cd70694b3 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
@@ -480,7 +480,7 @@ void NodeInstanceServer::setupDefaultDummyData()
     }
 
     if (m_dummyContextObject) {
-        qWarning() << "Loaded default dummy context object.";
+        qDebug() << "Loaded default dummy context object.";
         m_dummyContextObject->setParent(this);
     }
 
@@ -1134,7 +1134,7 @@ void NodeInstanceServer::loadDummyDataFile(const QFileInfo& qmlFileInfo)
     QVariant oldDummyDataObject = rootContext()->contextProperty(qmlFileInfo.completeBaseName());
 
     if (dummyData) {
-        qWarning() << "Loaded dummy data:" << qmlFileInfo.filePath();
+        qDebug() << "Loaded dummy data:" << qmlFileInfo.filePath();
         rootContext()->setContextProperty(qmlFileInfo.completeBaseName(), dummyData);
         dummyData->setParent(this);
         m_dummyObjectList.append(DummyPair(qmlFileInfo.completeBaseName(), dummyData));
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
index 3ed7fbf83d9..36e4b4cda89 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
@@ -973,6 +973,12 @@ QObject *ObjectNodeInstance::createComponentWrap(const QString &nodeSource, cons
     QQmlEngine::setContextForObject(object, context);
     QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
 
+    if (component->isError()) {
+        qWarning() << "Error in:" << Q_FUNC_INFO << component->url().toString();
+        foreach (const QQmlError &error, component->errors())
+            qWarning() << error;
+        qWarning() << "file data:\n" << data;
+    }
     return object;
 }
 
@@ -1018,7 +1024,7 @@ QObject *ObjectNodeInstance::createComponent(const QString &componentPath, QQmlC
     if (component.isError()) {
         qDebug() << componentPath;
         foreach (const QQmlError &error, component.errors())
-            qDebug() << error;
+            qWarning() << error;
     }
 
     QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
@@ -1038,11 +1044,10 @@ QObject *ObjectNodeInstance::createComponent(const QUrl &componentUrl, QQmlConte
     component.completeCreate();
 
     if (component.isError()) {
-        qDebug() << componentUrl;
+        qWarning() << "Error in:" << Q_FUNC_INFO << componentUrl;
         foreach (const QQmlError &error, component.errors())
-            qDebug() << error;
+            qWarning() << error;
     }
-
     QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
 
     return object;
@@ -1063,6 +1068,12 @@ QObject *ObjectNodeInstance::createCustomParserObject(const QString &nodeSource,
     component.completeCreate();
     QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
 
+    if (component.isError()) {
+        qWarning() << "Error in:" << Q_FUNC_INFO << component.url().toString();
+        foreach (const QQmlError &error, component.errors())
+            qWarning() << error;
+        qWarning() << "file data:\n" << data;
+    }
     return object;
 }
 
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
index 52e35221791..b4745a08191 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
@@ -950,6 +950,12 @@ QObject *ObjectNodeInstance::createCustomParserObject(const QString &nodeSource,
     tweakObjects(object);
     component.completeCreate();
 
+    if (component.isError()) {
+        qDebug() << component.url().toString();
+        foreach (const QDeclarativeError &error, component.errors())
+            qWarning() << error;
+    }
+
     QDeclarativeEngine::setObjectOwnership(object, QDeclarativeEngine::CppOwnership);
 
     return object;