Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I776abad2c248f697ff729057cfaff16b4a395380

2 files changed, 6 insertions, 1 deletions

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 336e047d..d0c6517c 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -1151,7 +1151,7 @@ void QDeclarativeCompiler::genValueTypeProperty(QDeclarativeParser::Object *obj,
     fetch.fetchValue.bindingSkipList = 0;
     fetch.line = prop->location.start.line;
 
-    if (obj->type == QMetaType::QVariant || output->types.at(obj->type).component) {
+    if (obj->type == -1 || output->types.at(obj->type).component) {
         // We only have to do this if this is a composite type.  If it is a builtin
         // type it can't possibly already have bindings that need to be cleared.
         foreach(Property *vprop, prop->value->valueProperties) {
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index e8f1a85b..5fd23600 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -1270,6 +1270,11 @@ void QDeclarativeXMLHttpRequest::finished()
         if (redirect.isValid()) {
             QUrl url = m_network->url().resolved(redirect.toUrl());
             if (url.scheme() != QLatin1String("file")) {
+                // See http://www.ietf.org/rfc/rfc2616.txt, section 10.3.4 "303 See Other":
+                // Result of 303 redirection should be a new "GET" request.
+                const QVariant code = m_network->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+                if (code.isValid() && code.toInt() == 303 && m_method != QLatin1String("GET"))
+                    m_method = QStringLiteral("GET");
                 destroyNetwork();
                 requestFromUrl(url);
                 return;