1 files changed, 20 insertions, 18 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 0ad3baf0bb..a5c920d28a 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -53,7 +53,6 @@
 #include "qqmlscriptstring.h"
 #include "qqmlglobal_p.h"
 #include "qqmlcomponent_p.h"
-#include "qqmlnetworkaccessmanagerfactory.h"
 #include "qqmldirparser_p.h"
 #include "qqmlextensioninterface.h"
 #include "qqmllist_p.h"
@@ -63,25 +62,25 @@
 #include "qqmlincubator.h"
 #include "qqmlabstracturlinterceptor.h"
 #include <private/qqmlboundsignal_p.h>
-
 #include <QtCore/qstandardpaths.h>
 #include <QtCore/qsettings.h>
-
 #include <QtCore/qmetaobject.h>
-#include <QNetworkAccessManager>
 #include <QDebug>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qmutex.h>
 #include <QtCore/qthread.h>
 #include <private/qthread_p.h>
+
+#ifndef QT_NO_NETWORK
+#include "qqmlnetworkaccessmanagerfactory.h"
+#include <QNetworkAccessManager>
 #include <QtNetwork/qnetworkconfigmanager.h>
+#endif
 
 #include <private/qobject_p.h>
 #include <private/qmetaobject_p.h>
-
 #include <private/qqmllocale_p.h>
-
 #include <private/qqmlbind_p.h>
 #include <private/qqmlconnections_p.h>
 #include <private/qqmltimer_p.h>
@@ -610,8 +609,10 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQmlEngine *e)
   cleanup(0), erroredBindings(0), inProgressCreations(0),
   workerScriptEngine(0),
   activeObjectCreator(0),
-  networkAccessManager(0), networkAccessManagerFactory(0), urlInterceptor(0),
-  scarceResourcesRefCount(0), importDatabase(e), typeLoader(e),
+#ifndef QT_NO_NETWORK
+  networkAccessManager(0), networkAccessManagerFactory(0),
+#endif
+  urlInterceptor(0), scarceResourcesRefCount(0), importDatabase(e), typeLoader(e),
   uniqueId(1), incubatorCount(0), incubationController(0)
 {
 }
@@ -1071,7 +1072,17 @@ QQmlAbstractUrlInterceptor *QQmlEngine::urlInterceptor() const
     return d->urlInterceptor;
 }
 
+void QQmlEnginePrivate::registerFinalizeCallback(QObject *obj, int index)
+{
+    if (activeObjectCreator) {
+        activeObjectCreator->finalizeCallbacks()->append(qMakePair(QPointer<QObject>(obj), index));
+    } else {
+        void *args[] = { 0 };
+        QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, index, args);
+    }
+}
 
+#ifndef QT_NO_NETWORK
 /*!
   Sets the \a factory to use for creating QNetworkAccessManager(s).
 
@@ -1100,16 +1111,6 @@ QQmlNetworkAccessManagerFactory *QQmlEngine::networkAccessManagerFactory() const
     return d->networkAccessManagerFactory;
 }
 
-void QQmlEnginePrivate::registerFinalizeCallback(QObject *obj, int index)
-{
-    if (activeObjectCreator) {
-        activeObjectCreator->finalizeCallbacks()->append(qMakePair(QPointer<QObject>(obj), index));
-    } else {
-        void *args[] = { 0 };
-        QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, index, args);
-    }
-}
-
 QNetworkAccessManager *QQmlEnginePrivate::createNetworkAccessManager(QObject *parent) const
 {
     QMutexLocker locker(&networkAccessManagerMutex);
@@ -1148,6 +1149,7 @@ QNetworkAccessManager *QQmlEngine::networkAccessManager() const
     Q_D(const QQmlEngine);
     return d->getNetworkAccessManager();
 }
+#endif // QT_NO_NETWORK
 
 /*!