From 17925c7a810159536cbfde189ec9f2a057cb89bc Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 12 Jan 2015 11:06:05 -0800
Subject: [PATCH] Use more appropriate QNetworkReply error code

This error code is available now that Interface is built with Qt 5.3.
---
 libraries/script-engine/src/XMLHttpRequestClass.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libraries/script-engine/src/XMLHttpRequestClass.cpp b/libraries/script-engine/src/XMLHttpRequestClass.cpp
index a756b3fe8f..92c9c1856c 100644
--- a/libraries/script-engine/src/XMLHttpRequestClass.cpp
+++ b/libraries/script-engine/src/XMLHttpRequestClass.cpp
@@ -66,7 +66,7 @@ QScriptValue XMLHttpRequestClass::getStatus() const {
                 return QScriptValue(200);
             case QNetworkReply::ContentNotFoundError:
                 return QScriptValue(404);
-            case QNetworkReply::ContentAccessDenied:
+            case QNetworkReply::ContentConflictError:
                 return QScriptValue(409);
             case QNetworkReply::TimeoutError:
                 return QScriptValue(408);
@@ -89,7 +89,7 @@ QString XMLHttpRequestClass::getStatusText() const {
                 return "OK";
             case QNetworkReply::ContentNotFoundError:
                 return "Not Found";
-            case QNetworkReply::ContentAccessDenied:
+            case QNetworkReply::ContentConflictError:
                 return "Conflict";
             case QNetworkReply::TimeoutError:
                 return "Timeout";
@@ -196,8 +196,7 @@ void XMLHttpRequestClass::open(const QString& method, const QString& url, bool a
                 } else if (!_file->open(QIODevice::ReadOnly)) {
                     qDebug() << "Can't open file " << _url.fileName();
                     abortRequest();
-                    //_errorCode = QNetworkReply::ContentConflictError;  // TODO: Use this status when update to Qt 5.3
-                    _errorCode = QNetworkReply::ContentAccessDenied;
+                    _errorCode = QNetworkReply::ContentConflictError;
                     setReadyState(DONE);
                     emit requestComplete();
                 } else {