diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-21 09:14:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-21 09:14:27 (GMT) |
| commit | 2030d44184ebaf2ee1bd47ff08f5ef058335b45e (patch) | |
| tree | 93a0690a85c542c45757dd8c1bdafb40b097b86a | |
| parent | c4a8f59a18132da71615f92eb406e1a759d96b18 (diff) | |
| parent | 1564d012dd12e891a8e9112b288c94fae00dd745 (diff) | |
| download | Qt-2030d44184ebaf2ee1bd47ff08f5ef058335b45e.zip Qt-2030d44184ebaf2ee1bd47ff08f5ef058335b45e.tar.gz Qt-2030d44184ebaf2ee1bd47ff08f5ef058335b45e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing the compile issue.
Fixing the compile issue.
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro | 4 |
2 files changed, 5 insertions, 1 deletions
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 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 +} |