Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

2 files changed, 11 insertions, 10 deletions

diff --git a/examples/network/downloadmanager/downloadmanager.cpp b/examples/network/downloadmanager/downloadmanager.cpp
index 9e0c03c6af..eceb48977b 100644
--- a/examples/network/downloadmanager/downloadmanager.cpp
+++ b/examples/network/downloadmanager/downloadmanager.cpp
@@ -67,13 +67,13 @@ void DownloadManager::append(const QStringList &urls)
         append(QUrl::fromEncoded(urlAsString.toLocal8Bit()));
 
     if (downloadQueue.isEmpty())
-        QTimer::singleShot(0, this, SIGNAL(finished()));
+        QTimer::singleShot(0, this, &DownloadManager::finished);
 }
 
 void DownloadManager::append(const QUrl &url)
 {
     if (downloadQueue.isEmpty())
-        QTimer::singleShot(0, this, SLOT(startNextDownload()));
+        QTimer::singleShot(0, this, &DownloadManager::startNextDownload);
 
     downloadQueue.enqueue(url);
     ++totalCount;
@@ -123,12 +123,12 @@ void DownloadManager::startNextDownload()
 
     QNetworkRequest request(url);
     currentDownload = manager.get(request);
-    connect(currentDownload, SIGNAL(downloadProgress(qint64,qint64)),
-            SLOT(downloadProgress(qint64,qint64)));
-    connect(currentDownload, SIGNAL(finished()),
-            SLOT(downloadFinished()));
-    connect(currentDownload, SIGNAL(readyRead()),
-            SLOT(downloadReadyRead()));
+    connect(currentDownload, &QNetworkReply::downloadProgress,
+            this, &DownloadManager::downloadProgress);
+    connect(currentDownload, &QNetworkReply::finished,
+            this, &DownloadManager::downloadFinished);
+    connect(currentDownload, &QNetworkReply::readyRead,
+            this, &DownloadManager::downloadReadyRead);
 
     // prepare the output
     printf("Downloading %s...\n", url.toEncoded().constData());
@@ -162,7 +162,7 @@ void DownloadManager::downloadFinished()
     progressBar.clear();
     output.close();
 
-    if (currentDownload->error()) {
+    if (currentDownload->networkError()) {
         // download failed
         fprintf(stderr, "Failed: %s\n", qPrintable(currentDownload->errorString()));
         output.remove();
diff --git a/examples/network/downloadmanager/main.cpp b/examples/network/downloadmanager/main.cpp
index e3ba490992..eb1bd1ce9a 100644
--- a/examples/network/downloadmanager/main.cpp
+++ b/examples/network/downloadmanager/main.cpp
@@ -76,6 +76,7 @@ int main(int argc, char **argv)
     DownloadManager manager;
     manager.append(arguments);
 
-    QObject::connect(&manager, SIGNAL(finished()), &app, SLOT(quit()));
+    QObject::connect(&manager, &DownloadManager::finished,
+                     &app, &QCoreApplication::quit);
     app.exec();
 }