Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/corelib/io/qurl.cpp
	src/gui/kernel/qwindow.cpp
	src/tools/moc/generator.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	src/widgets/styles/qstyle.h
	src/widgets/widgets/qtabbar.cpp
	tests/auto/corelib/codecs/utf8/tst_utf8.cpp

Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e

2 files changed, 5 insertions, 3 deletions

diff --git a/tests/manual/qnetworkaccessmanager/qget/downloadmanager.cpp b/tests/manual/qnetworkaccessmanager/qget/downloadmanager.cpp
index e3ba3ca88f..5eab6d43bd 100644
--- a/tests/manual/qnetworkaccessmanager/qget/downloadmanager.cpp
+++ b/tests/manual/qnetworkaccessmanager/qget/downloadmanager.cpp
@@ -83,7 +83,7 @@ void DownloadManager::upload(const QUrl &url, const QString &user, const QString
     connect(ul, SIGNAL(downloadFinished(TransferItem*)), SLOT(downloadFinished(TransferItem*)));
 }
 
-void DownloadManager::finished(QNetworkReply *reply)
+void DownloadManager::finished(QNetworkReply *)
 {
 }
 
@@ -121,7 +121,7 @@ void DownloadManager::authenticationRequired(QNetworkReply *reply, QAuthenticato
     qDebug() << "authenticationRequired" << reply;
     TransferItem *transfer = findTransfer(reply);
     //provide the credentials exactly once, so that it fails if credentials are incorrect.
-    if (transfer && !transfer->user.isEmpty() || !transfer->password.isEmpty()) {
+    if ((transfer && !transfer->user.isEmpty()) || !transfer->password.isEmpty()) {
         auth->setUser(transfer->user);
         auth->setPassword(transfer->password);
         transfer->user.clear();
@@ -129,7 +129,7 @@ void DownloadManager::authenticationRequired(QNetworkReply *reply, QAuthenticato
     }
 }
 
-void DownloadManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth)
+void DownloadManager::proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *auth)
 {
     //provide the credentials exactly once, so that it fails if credentials are incorrect.
     if (!proxyUser.isEmpty() || !proxyPassword.isEmpty()) {
diff --git a/tests/manual/qnetworkaccessmanager/qget/qget.h b/tests/manual/qnetworkaccessmanager/qget/qget.h
index bad4f5e4d2..978212dfa8 100644
--- a/tests/manual/qnetworkaccessmanager/qget/qget.h
+++ b/tests/manual/qnetworkaccessmanager/qget/qget.h
@@ -113,7 +113,9 @@ private slots:
     void finished(QNetworkReply *reply);
     void authenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator);
     void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator);
+#ifndef QT_NO_SSL
     void sslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
+#endif
     void downloadFinished(TransferItem *item);
 private:
     TransferItem *findTransfer(QNetworkReply *reply);