From 1c51d8c798ca981206dafc06595a198dc1d42798 Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Fri, 21 May 2010 09:41:19 +0200
Subject: Fixing the compile issue.

We have to explicitely specify the include path to the MW headers
for Symbian. The compiler always gets confused if the private headers
get in the way.

Reviewed-by: TrustMe
---
 tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
index 0021bc1..7746642 100644
--- a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
+++ b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
@@ -4,3 +4,7 @@ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
 requires(contains(QT_CONFIG,private_tests))
 
 QT = core network
+
+symbian: {
+  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+}
-- 
cgit v0.12


From 1564d012dd12e891a8e9112b288c94fae00dd745 Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Fri, 21 May 2010 09:44:51 +0200
Subject: Fixing the compile issue.

Private headers have to be included in consistent and proper way:
not like "name_p.h" or "../name_p.h" but <private/name_p.h>
---
 src/network/access/qhttpnetworkconnectionchannel_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index 51cb5e8..41a896d 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -65,7 +65,7 @@
 #include <private/qhttpnetworkrequest_p.h>
 #include <private/qhttpnetworkreply_p.h>
 
-#include "qhttpnetworkconnection_p.h"
+#include <private/qhttpnetworkconnection_p.h>
 
 #ifndef QT_NO_HTTP
 
-- 
cgit v0.12