3 files changed, 3 insertions, 25 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index a5aaf6af25..150f5c4616 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -6742,7 +6742,7 @@ void tst_QNetworkReply::pipeliningHelperSlot() {
         pipeliningWasUsed = true;
 
     // check that the contents match (the response to echo.cgi?3 should return 3 etc.)
-    QString urlQueryString = reply->url().queryItems().at(0).first;
+    QString urlQueryString = reply->url().query();
     QString content = reply->readAll();
     QVERIFY2(urlQueryString == content, "data corruption with pipelining detected");
 
diff --git a/tests/auto/other/networkselftest/tst_networkselftest.cpp b/tests/auto/other/networkselftest/tst_networkselftest.cpp
index ebb8443748..8575b11fca 100644
--- a/tests/auto/other/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/other/networkselftest/tst_networkselftest.cpp
@@ -659,9 +659,10 @@ void tst_NetworkSelfTest::httpServerFiles()
 {
     QFETCH(QString, uri);
     QFETCH(int, size);
+    QUrl url(uri);
 
     QList<Chat> chat;
-    chat << Chat::send("HEAD " + QUrl::toPercentEncoding(uri, "/") + " HTTP/1.0\r\n"
+    chat << Chat::send("HEAD " + url.toEncoded() + " HTTP/1.0\r\n"
                        "Host: " + QtNetworkSettings::serverName().toLatin1() + "\r\n"
                        "Connection: close\r\n"
                        "Authorization: Basic cXNvY2tzdGVzdDpwYXNzd29yZA==\r\n"
diff --git a/tests/benchmarks/corelib/io/qurl/main.cpp b/tests/benchmarks/corelib/io/qurl/main.cpp
index dc236e7120..32cd13ad12 100644
--- a/tests/benchmarks/corelib/io/qurl/main.cpp
+++ b/tests/benchmarks/corelib/io/qurl/main.cpp
@@ -56,8 +56,6 @@ private slots:
     void toLocalFile();
     void toString_data();
     void toString();
-    void toEncoded_data();
-    void toEncoded();
     void resolved_data();
     void resolved();
     void equality_data();
@@ -160,27 +158,6 @@ void tst_qurl::toString()
     }
 }
 
-void tst_qurl::toEncoded_data()
-{
-   generateFirstRunData();
-}
-
-void tst_qurl::toEncoded()
-{
-   QFETCH(bool, firstRun);
-   if(firstRun) {
-       QBENCHMARK {
-           QUrl url("pics/avatar.png");
-           url.toEncoded(QUrl::FormattingOption(0x100));
-       }
-   } else {
-       QUrl url("pics/avatar.png");
-       QBENCHMARK {
-           url.toEncoded(QUrl::FormattingOption(0x100));
-       }
-   }
-}
-
 void tst_qurl::resolved_data()
 {
    generateFirstRunData();