Initial import from qtquick2.

Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469

1 files changed, 21 insertions, 0 deletions

diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index aefc896f5b..930d345285 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -101,6 +101,8 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(xhrDump, QML_XHR_DUMP);
 
+namespace {
+
 class DocumentImpl;
 class NodeImpl 
 {
@@ -323,6 +325,8 @@ public:
     static QScriptValue load(QScriptEngine *engine, const QByteArray &data);
 };
 
+}
+
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Node)
@@ -1231,6 +1235,18 @@ void QDeclarativeXMLHttpRequest::downloadProgress(qint64 bytes)
     }
 }
 
+static const char *errorToString(QNetworkReply::NetworkError error)
+{
+    int idx = QNetworkReply::staticMetaObject.indexOfEnumerator("NetworkError");
+    if (idx == -1) return "EnumLookupFailed";
+
+    QMetaEnum e = QNetworkReply::staticMetaObject.enumerator(idx);
+
+    const char *name = e.valueToKey(error);
+    if (!name) return "EnumLookupFailed";
+    else return name;
+}
+
 void QDeclarativeXMLHttpRequest::error(QNetworkReply::NetworkError error)
 {
     Q_UNUSED(error)
@@ -1245,6 +1261,11 @@ void QDeclarativeXMLHttpRequest::error(QNetworkReply::NetworkError error)
     m_data.clear();
     destroyNetwork();
 
+    if (xhrDump()) {
+        qWarning().nospace() << "XMLHttpRequest: ERROR " << qPrintable(m_url.toString());
+        qWarning().nospace() << "    " << error << " " << errorToString(error) << " " << m_statusText;
+    }
+
     if (error == QNetworkReply::ContentAccessDenied ||
         error == QNetworkReply::ContentOperationNotPermittedError ||
         error == QNetworkReply::ContentNotFoundError ||