1 files changed, 10 insertions, 64 deletions

diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp
index c185894ab3..76545ba692 100644
--- a/src/qml/jsruntime/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qv4include_p.h"
 #include "qv4scopedvalue_p.h"
@@ -62,7 +26,7 @@ QV4Include::QV4Include(const QUrl &url, QV4::ExecutionEngine *engine,
     : QObject(engine->jsEngine())
     , v4(engine), m_url(url)
 #if QT_CONFIG(qml_network)
-    , m_redirectCount(0), m_network(nullptr) , m_reply(nullptr)
+    , m_network(nullptr) , m_reply(nullptr)
 #endif
 {
     if (qmlContext)
@@ -127,9 +91,9 @@ void QV4Include::callback(const QV4::Value &callback, const QV4::Value &status)
     if (!f)
         return;
 
-    QV4::JSCallData jsCallData(scope, 1);
-    *jsCallData->thisObject = v4->globalObject->asReturnedValue();
-    jsCallData->args[0] = status;
+    QV4::JSCallArguments jsCallData(scope, 1);
+    *jsCallData.thisObject = v4->globalObject->asReturnedValue();
+    jsCallData.args[0] = status;
     f->call(jsCallData);
     if (scope.hasException())
         scope.engine->catchException();
@@ -140,27 +104,9 @@ QV4::ReturnedValue QV4Include::result()
     return m_resultObject.value();
 }
 
-#define INCLUDE_MAXIMUM_REDIRECT_RECURSION 15
 void QV4Include::finished()
 {
 #if QT_CONFIG(qml_network)
-    m_redirectCount++;
-
-    if (m_redirectCount < INCLUDE_MAXIMUM_REDIRECT_RECURSION) {
-        QVariant redirect = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
-        if (redirect.isValid()) {
-            m_url = m_url.resolved(redirect.toUrl());
-            delete m_reply;
-
-            QNetworkRequest request;
-            request.setUrl(m_url);
-
-            m_reply = m_network->get(request);
-            QObject::connect(m_reply, SIGNAL(finished()), this, SLOT(finished()));
-            return;
-        }
-    }
-
     QV4::Scope scope(v4);
     QV4::ScopedObject resultObj(scope, m_resultObject.value());
     QV4::ScopedString status(scope, v4->newString(QStringLiteral("status")));
@@ -173,9 +119,9 @@ void QV4Include::finished()
         QV4::Script script(v4, qml, /*parse as QML binding*/false, code, m_url.toString());
 
         script.parse();
-        if (!scope.engine->hasException)
+        if (!scope.hasException())
             script.run();
-        if (scope.engine->hasException) {
+        if (scope.hasException()) {
             QV4::ScopedValue ex(scope, scope.engine->catchException());
             resultObj->put(status, QV4::ScopedValue(scope, QV4::Value::fromInt32(Exception)));
             QV4::ScopedString exception(scope, v4->newString(QStringLiteral("exception")));
@@ -245,9 +191,9 @@ QJSValue QV4Include::method_include(QV4::ExecutionEngine *engine, const QUrl &ur
 
         if (!script.isNull()) {
             script->parse();
-            if (!scope.engine->hasException)
+            if (!scope.hasException())
                 script->run();
-            if (scope.engine->hasException) {
+            if (scope.hasException()) {
                 QV4::ScopedValue ex(scope, scope.engine->catchException());
                 result = resultValue(scope.engine, Exception);
                 QV4::ScopedString exception(scope, scope.engine->newString(QStringLiteral("exception")));