1 files changed, 15 insertions, 15 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp
index 36569b0a60..92face6f94 100644
--- a/src/qml/jsruntime/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
@@ -72,13 +72,17 @@ QV4Include::QV4Include(const QUrl &url, QV4::ExecutionEngine *engine,
     m_resultObject.set(v4, resultValue(v4));
 
 #if QT_CONFIG(qml_network)
-    m_network = engine->v8Engine->networkAccessManager();
+    if (QQmlEngine *qmlEngine = engine->qmlEngine()) {
+        m_network = qmlEngine->networkAccessManager();
 
-    QNetworkRequest request;
-    request.setUrl(url);
+        QNetworkRequest request;
+        request.setUrl(url);
 
-    m_reply = m_network->get(request);
-    QObject::connect(m_reply, SIGNAL(finished()), this, SLOT(finished()));
+        m_reply = m_network->get(request);
+        QObject::connect(m_reply, SIGNAL(finished()), this, SLOT(finished()));
+    } else {
+        finished();
+    }
 #else
     finished();
 #endif
@@ -163,7 +167,6 @@ void QV4Include::finished()
         QByteArray data = m_reply->readAll();
 
         QString code = QString::fromUtf8(data);
-        QmlIR::Document::removeScriptPragmas(code);
 
         QV4::Scoped<QV4::QmlContext> qml(scope, m_qmlContext.value());
         QV4::Script script(v4, qml, /*parse as QML binding*/false, code, m_url.toString());
@@ -197,7 +200,7 @@ void QV4Include::finished()
 }
 
 /*
-    Documented in qv8engine.cpp
+    Documented in qv4engine.cpp
 */
 QV4::ReturnedValue QV4Include::method_include(const QV4::FunctionObject *b, const QV4::Value *, const QV4::Value *argv, int argc)
 {
@@ -214,7 +217,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 +227,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 +258,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();
 }