6 files changed, 8 insertions, 25 deletions
diff --git a/examples/network/download/download.pro b/examples/network/download/download.pro
index 7c53044f69..3eabedd375 100644
--- a/examples/network/download/download.pro
+++ b/examples/network/download/download.pro
@@ -1,14 +1,6 @@
-######################################################################
-# Automatically generated by qmake (2.01a) fr. nov. 16 13:18:20 2007
-######################################################################
-
-TEMPLATE = app
-DEPENDPATH += .
-INCLUDEPATH += .
 QT = core network
 CONFIG += console
 
-# Input
 SOURCES += main.cpp
 
 # install
@@ -17,5 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/download
 INSTALLS += target sources
 
-
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/network/download/main.cpp b/examples/network/download/main.cpp
index aea42a540c..ae3aa1f78b 100644
--- a/examples/network/download/main.cpp
+++ b/examples/network/download/main.cpp
@@ -151,7 +151,7 @@ void DownloadManager::execute()
 
 void DownloadManager::sslErrors(const QList<QSslError> &sslErrors)
 {
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     foreach (const QSslError &error, sslErrors)
         fprintf(stderr, "SSL error: %s\n", qPrintable(error.errorString()));
 #endif
diff --git a/examples/network/downloadmanager/downloadmanager.pro b/examples/network/downloadmanager/downloadmanager.pro
index 6b7e4f8757..04a6c4c4ea 100644
--- a/examples/network/downloadmanager/downloadmanager.pro
+++ b/examples/network/downloadmanager/downloadmanager.pro
@@ -1,14 +1,6 @@
-######################################################################
-# Automatically generated by qmake (2.01a) fr. nov. 16 14:11:36 2007
-######################################################################
-
-TEMPLATE = app
-DEPENDPATH += .
-INCLUDEPATH += .
 QT = core network
 CONFIG += console
 
-# Input
 HEADERS += downloadmanager.h textprogressbar.h
 SOURCES += downloadmanager.cpp main.cpp textprogressbar.cpp
 
@@ -18,7 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/downloadmanager
 INSTALLS += target sources
 
-
 OTHER_FILES += \
     debian/changelog \
     debian/compat \
@@ -26,4 +17,5 @@ OTHER_FILES += \
     debian/copyright \
     debian/README \
     debian/rules
+
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp
index 2f5f739853..c56a6fa53f 100644
--- a/examples/network/http/httpwindow.cpp
+++ b/examples/network/http/httpwindow.cpp
@@ -47,7 +47,7 @@
 HttpWindow::HttpWindow(QWidget *parent)
     : QDialog(parent)
 {
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     urlLineEdit = new QLineEdit("https://qt.nokia.com/");
 #else
     urlLineEdit = new QLineEdit("http://qt.nokia.com/");
@@ -75,7 +75,7 @@ HttpWindow::HttpWindow(QWidget *parent)
 
     connect(&qnam, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)),
             this, SLOT(slotAuthenticationRequired(QNetworkReply*,QAuthenticator*)));
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     connect(&qnam, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
             this, SLOT(sslErrors(QNetworkReply*,QList<QSslError>)));
 #endif
@@ -247,7 +247,7 @@ void HttpWindow::slotAuthenticationRequired(QNetworkReply*,QAuthenticator *authe
     }
 }
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 void HttpWindow::sslErrors(QNetworkReply*,const QList<QSslError> &errors)
 {
     QString errorString;
diff --git a/examples/network/http/httpwindow.h b/examples/network/http/httpwindow.h
index 54587b2f6d..a3694ddcbe 100644
--- a/examples/network/http/httpwindow.h
+++ b/examples/network/http/httpwindow.h
@@ -76,7 +76,7 @@ private slots:
     void updateDataReadProgress(qint64 bytesRead, qint64 totalBytes);
     void enableDownloadButton();
     void slotAuthenticationRequired(QNetworkReply*,QAuthenticator *);
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     void sslErrors(QNetworkReply*,const QList<QSslError> &errors);
 #endif
 
diff --git a/examples/network/torrent/trackerclient.cpp b/examples/network/torrent/trackerclient.cpp
index 38f9eaf9fd..12f9504b7b 100644
--- a/examples/network/torrent/trackerclient.cpp
+++ b/examples/network/torrent/trackerclient.cpp
@@ -108,10 +108,10 @@ void TrackerClient::fetchPeerList()
 
     // Percent encode the hash
     QByteArray infoHash = torrentDownloader->infoHash();
-    QString encodedSum;
+    QByteArray encodedSum;
     for (int i = 0; i < infoHash.size(); ++i) {
         encodedSum += '%';
-        encodedSum += QString::number(infoHash[i], 16).right(2).rightJustified(2, '0');
+        encodedSum += QByteArray::number(infoHash[i], 16).right(2).rightJustified(2, '0');
     }
 
     bool seeding = (torrentDownloader->state() == TorrentClient::Seeding);