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>

1 files changed, 12 insertions, 7 deletions

diff --git a/src/quick/items/qquickborderimage_p_p.h b/src/quick/items/qquickborderimage_p_p.h
index 478de88a52..1dc530e34e 100644
--- a/src/quick/items/qquickborderimage_p_p.h
+++ b/src/quick/items/qquickborderimage_p_p.h
@@ -58,17 +58,20 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_NETWORK
 class QNetworkReply;
+#endif
 class QQuickBorderImagePrivate : public QQuickImageBasePrivate
 {
     Q_DECLARE_PUBLIC(QQuickBorderImage)
 
 public:
     QQuickBorderImagePrivate()
-      : border(0), sciReply(0),
-        horizontalTileMode(QQuickBorderImage::Stretch),
-        verticalTileMode(QQuickBorderImage::Stretch),
-        redirectCount(0), pixmapChanged(false)
+      : border(0), horizontalTileMode(QQuickBorderImage::Stretch),
+        verticalTileMode(QQuickBorderImage::Stretch), pixmapChanged(false)
+#ifndef QT_NO_NETWORK
+      , sciReply(0), redirectCount(0)
+#endif
     {
     }
 
@@ -90,12 +93,14 @@ public:
 
     QQuickScaleGrid *border;
     QUrl sciurl;
-    QNetworkReply *sciReply;
     QQuickBorderImage::TileMode horizontalTileMode;
     QQuickBorderImage::TileMode verticalTileMode;
-    int redirectCount;
-
     bool pixmapChanged : 1;
+
+#ifndef QT_NO_NETWORK
+    QNetworkReply *sciReply;
+    int redirectCount;
+#endif
 };
 
 QT_END_NAMESPACE