From c7ac28fa354b96de37dc6cde5e3728da8daaacbb Mon Sep 17 00:00:00 2001
From: Paolo Angelelli <paolo.angelelli@theqtcompany.com>
Date: Tue, 16 Feb 2016 17:40:12 +0100
Subject: QtLite: no_network option for QtDeclarative

This patch adds the support for a no_network option for
QtDeclarative, and the necessary #ifndef all around the
code.
no_network changes the interface of some classes, therefore
using it breaks source compatibility.

Change-Id: Iff612fb07041b8a7db99bd595bf038efaac2dd8a
Reviewed-by: Risto Avila <risto.avila@theqtcompany.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
---
 src/qml/types/qquickworkerscript.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/qml/types/qquickworkerscript.cpp')

diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index e819e4ee7d..bc15b2fd9b 100644
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -52,10 +52,12 @@
 #include <QtCore/qwaitcondition.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qdatetime.h>
-#include <QtNetwork/qnetworkaccessmanager.h>
 #include <QtQml/qqmlinfo.h>
 #include <QtQml/qqmlfile.h>
+#ifndef QT_NO_NETWORK
+#include <QtNetwork/qnetworkaccessmanager.h>
 #include "qqmlnetworkaccessmanagerfactory.h"
+#endif
 
 #include <private/qv8engine_p.h>
 #include <private/qv4serialize_p.h>
@@ -141,7 +143,10 @@ public:
         ~WorkerEngine();
 
         void init();
+
+#ifndef QT_NO_NETWORK
         virtual QNetworkAccessManager *networkAccessManager();
+#endif
 
         QQuickWorkerScriptEnginePrivate *p;
 
@@ -150,7 +155,9 @@ public:
         QV4::PersistentValue onmessage;
     private:
         QV4::PersistentValue createsend;
+#ifndef QT_NO_NETWORK
         QNetworkAccessManager *accessManager;
+#endif
     };
 
     WorkerEngine *workerEngine;
@@ -194,14 +201,19 @@ private:
 };
 
 QQuickWorkerScriptEnginePrivate::WorkerEngine::WorkerEngine(QQuickWorkerScriptEnginePrivate *parent)
-: QV8Engine(0), p(parent), accessManager(0)
+: QV8Engine(0), p(parent)
+#ifndef QT_NO_NETWORK
+, accessManager(0)
+#endif
 {
     m_v4Engine->v8Engine = this;
 }
 
 QQuickWorkerScriptEnginePrivate::WorkerEngine::~WorkerEngine()
 {
+#ifndef QT_NO_NETWORK
     delete accessManager;
+#endif
 }
 
 void QQuickWorkerScriptEnginePrivate::WorkerEngine::init()
@@ -262,6 +274,7 @@ QV4::ReturnedValue QQuickWorkerScriptEnginePrivate::WorkerEngine::sendFunction(i
     return v->asReturnedValue();
 }
 
+#ifndef QT_NO_NETWORK
 QNetworkAccessManager *QQuickWorkerScriptEnginePrivate::WorkerEngine::networkAccessManager()
 {
     if (!accessManager) {
@@ -273,6 +286,7 @@ QNetworkAccessManager *QQuickWorkerScriptEnginePrivate::WorkerEngine::networkAcc
     }
     return accessManager;
 }
+#endif
 
 QQuickWorkerScriptEnginePrivate::QQuickWorkerScriptEnginePrivate(QQmlEngine *engine)
 : workerEngine(0), qmlengine(engine), m_nextId(0)
-- 
cgit v1.2.3