Don't needlessly restrict Qt.include() in case !qml-network

Change-Id: I1cc23941121a5b2b16e94fc46e48bdce1f452afb
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

1 files changed, 5 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp
index 36569b0a60..3c732bc555 100644
--- a/src/qml/jsruntime/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
@@ -214,7 +214,6 @@ QV4::ReturnedValue QV4Include::method_include(const QV4::FunctionObject *b, cons
     if (argc >= 2 && argv[1].as<QV4::FunctionObject>())
         callbackFunction = argv[1];
 
-#if QT_CONFIG(qml_network)
     QUrl url(scope.engine->resolvedUrl(argv[0].toQStringNoThrow()));
     if (scope.engine->qmlEngine() && scope.engine->qmlEngine()->urlInterceptor())
         url = scope.engine->qmlEngine()->urlInterceptor()->intercept(url, QQmlAbstractUrlInterceptor::JavaScriptFile);
@@ -225,9 +224,13 @@ QV4::ReturnedValue QV4Include::method_include(const QV4::FunctionObject *b, cons
     QV4::Scoped<QV4::QmlContext> qmlcontext(scope, scope.engine->qmlContext());
 
     if (localFile.isEmpty()) {
+#if QT_CONFIG(qml_network)
         QV4Include *i = new QV4Include(url, scope.engine, qmlcontext, callbackFunction);
         result = i->result();
-
+#else
+        result = resultValue(scope.engine, NetworkError);
+        callback(callbackFunction, result);
+#endif
     } else {
         QScopedPointer<QV4::Script> script;
         QString error;
@@ -252,12 +255,6 @@ QV4::ReturnedValue QV4Include::method_include(const QV4::FunctionObject *b, cons
         callback(callbackFunction, result);
     }
 
-#else
-    QV4::ScopedValue result(scope);
-    result = resultValue(scope.engine, NetworkError);
-    callback(callbackFunction, result);
-#endif
-
     return result->asReturnedValue();
 }