Merge "Merge remote-tracking branch 'origin/5.15' into dev"

3 files changed, 40 insertions, 77 deletions

diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5
new file mode 100644
index 0000000..e8be931
--- /dev/null
+++ b/dist/changes-5.12.5
@@ -0,0 +1,20 @@
+Qt 5.12.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.4.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1
new file mode 100644
index 0000000..57ebdbe
--- /dev/null
+++ b/dist/changes-5.13.1
@@ -0,0 +1,20 @@
+Qt 5.13.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/tests/auto/oauth1/tst_oauth1.cpp b/tests/auto/oauth1/tst_oauth1.cpp
index eb13420..10da4f9 100644
--- a/tests/auto/oauth1/tst_oauth1.cpp
+++ b/tests/auto/oauth1/tst_oauth1.cpp
@@ -637,28 +637,6 @@ void tst_OAuth1::grant_data()
                                     << QUrl("http://term.ie/oauth/example/echo_api.php")
                                     << QNetworkAccessManager::PostOperation;
     }
-    if (hostReachable(QLatin1String("oauthbin.com"))) {
-        QTest::newRow("oauthbin.com_get") << "key"
-                                        << "secret"
-                                        << "requestkey"
-                                        << "requestsecret"
-                                        << "accesskey"
-                                        << "accesssecret"
-                                        << QUrl("http://oauthbin.com/v1/request-token")
-                                        << QUrl("http://oauthbin.com/v1/access-token")
-                                        << QUrl("http://oauthbin.com/v1/echo")
-                                        << QNetworkAccessManager::GetOperation;
-        QTest::newRow("oauthbin.com_post") << "key"
-                                        << "secret"
-                                        << "requestkey"
-                                        << "requestsecret"
-                                        << "accesskey"
-                                        << "accesssecret"
-                                        << QUrl("http://oauthbin.com/v1/request-token")
-                                        << QUrl("http://oauthbin.com/v1/access-token")
-                                        << QUrl("http://oauthbin.com/v1/echo")
-                                        << QNetworkAccessManager::PostOperation;
-    }
 }
 
 void tst_OAuth1::grant()
@@ -762,30 +740,6 @@ void tst_OAuth1::authenticatedCalls_data()
             << parameters
             << QNetworkAccessManager::GetOperation;
     }
-    if (hostReachable(QLatin1String("oauthbin.com"))) {
-        QTest::newRow("oauthbin.com_get") << "key"
-                                        << "secret"
-                                        << "accesskey"
-                                        << "accesssecret"
-                                        << QUrl("http://oauthbin.com/v1/echo")
-                                        << parameters
-                                        << QNetworkAccessManager::GetOperation;
-        QTest::newRow("oauthbin.com_post") << "key"
-                                        << "secret"
-                                        << "accesskey"
-                                        << "accesssecret"
-                                        << QUrl("http://oauthbin.com/v1/echo")
-                                        << parameters
-                                        << QNetworkAccessManager::PostOperation;
-        QTest::newRow("oauthbin.com_percent_encoded_query")
-            << "key"
-            << "secret"
-            << "accesskey"
-            << "accesssecret"
-            << QUrl("http://oauthbin.com/v1/echo?key=%40value+1%2B2=3")
-            << parameters
-            << QNetworkAccessManager::GetOperation;
-    }
 }
 
 void tst_OAuth1::authenticatedCalls()
@@ -879,37 +833,6 @@ void tst_OAuth1::prepareRequestCalls_data()
             << parameters
             << QByteArray("GET");
     }
-    if (hostReachable(QLatin1String("oauthbin.com"))) {
-        QTest::newRow("oauthbin.com_get") << "key"
-                                          << "secret"
-                                          << "accesskey"
-                                          << "accesssecret"
-                                          << QUrl("http://oauthbin.com/v1/echo")
-                                          << parameters
-                                          << QByteArray("GET");
-        QTest::newRow("oauthbin.com_post") << "key"
-                                           << "secret"
-                                           << "accesskey"
-                                           << "accesssecret"
-                                           << QUrl("http://oauthbin.com/v1/echo")
-                                           << parameters
-                                           << QByteArray("POST");
-        QTest::newRow("oauthbin.com_percent_encoded_query")
-            << "key"
-            << "secret"
-            << "accesskey"
-            << "accesssecret"
-            << QUrl("http://oauthbin.com/v1/echo?key=%40value+1%2B2=3")
-            << parameters
-            << QByteArray("GET");
-        QTest::newRow("oauthbin.com_patch") << "key"
-                                            << "secret"
-                                            << "accesskey"
-                                            << "accesssecret"
-                                            << QUrl("http://oauthbin.com/v1/echo")
-                                            << parameters
-                                            << QByteArray("PATCH");
-    }
 }
 
 void tst_OAuth1::prepareRequestCalls()