Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60

Conflicts:
	qmake/generators/symbian/initprojectdeploy_symbian.cpp
	qmake/generators/symbian/symmake_abld.h

1 files changed, 15 insertions, 8 deletions

diff --git a/examples/network/http/httpwindow.h b/examples/network/http/httpwindow.h
index 9dca8a5..83898af 100644
--- a/examples/network/http/httpwindow.h
+++ b/examples/network/http/httpwindow.h
@@ -43,18 +43,21 @@
 #define HTTPWINDOW_H
 
 #include <QDialog>
+#include <QNetworkAccessManager>
+#include <QUrl>
 
 QT_BEGIN_NAMESPACE
 class QDialogButtonBox;
 class QFile;
-class QHttp;
-class QHttpResponseHeader;
 class QLabel;
 class QLineEdit;
 class QProgressDialog;
 class QPushButton;
 class QSslError;
 class QAuthenticator;
+class QNetworkReply;
+
+
 QT_END_NAMESPACE
 
 class HttpWindow : public QDialog
@@ -64,16 +67,18 @@ class HttpWindow : public QDialog
 public:
     HttpWindow(QWidget *parent = 0);
 
+    void startRequest(QUrl url);
+
 private slots:
     void downloadFile();
     void cancelDownload();
-    void httpRequestFinished(int requestId, bool error);
-    void readResponseHeader(const QHttpResponseHeader &responseHeader);
-    void updateDataReadProgress(int bytesRead, int totalBytes);
+    void httpFinished();
+    void httpReadyRead();
+    void updateDataReadProgress(qint64 bytesRead, qint64 totalBytes);
     void enableDownloadButton();
-    void slotAuthenticationRequired(const QString &, quint16, QAuthenticator *);
+    void slotAuthenticationRequired(QNetworkReply*,QAuthenticator *);
 #ifndef QT_NO_OPENSSL
-    void sslErrors(const QList<QSslError> &errors);
+    void sslErrors(QNetworkReply*,const QList<QSslError> &errors);
 #endif
 
 private:
@@ -85,7 +90,9 @@ private:
     QPushButton *quitButton;
     QDialogButtonBox *buttonBox;
 
-    QHttp *http;
+    QUrl url;
+    QNetworkAccessManager qnam;
+    QNetworkReply *reply;
     QFile *file;
     int httpGetId;
     bool httpRequestAborted;