1 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
index 3ce1153031..cc77ba2da3 100644
--- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QtTest/QTest>
@@ -23,6 +23,8 @@
 
 #include "../../../network-settings.h"
 
+using namespace std::chrono_literals;
+
 class tst_QSocks5SocketEngine : public QObject, public QAbstractSocketEngineReceiver
 {
     Q_OBJECT
@@ -341,7 +343,7 @@ void tst_QSocks5SocketEngine::simpleErrorsAndStates()
         QCOMPARE(socketDevice.state(), QAbstractSocket::UnconnectedState);
         QVERIFY(!socketDevice.connectToHost(QHostInfo::fromName(QtNetworkSettings::socksProxyServerName()).addresses().first(), 8088));
         QCOMPARE(socketDevice.state(), QAbstractSocket::ConnectingState);
-        if (socketDevice.waitForWrite(15000)) {
+        if (socketDevice.waitForWrite(15s)) {
             QVERIFY(socketDevice.state() == QAbstractSocket::UnconnectedState ||
                     socketDevice.state() == QAbstractSocket::ConnectedState);
         } else {
@@ -915,13 +917,13 @@ void tst_QSocks5SocketEngine::fragmentation_data()
     responses << authMethodBasic << authSuccess.left(1) << authSuccess.mid(1) << connectResponseIPv4;
     QTest::newRow("auth-response") << responses;
 
-    for (int i = 1; i < connectResponseIPv4.length() - 1; i++) {
+    for (int i = 1; i < connectResponseIPv4.size() - 1; i++) {
         responses.clear();
         responses << authMethodNone << connectResponseIPv4.left(i) << connectResponseIPv4.mid(i);
         QTest::newRow(qPrintable(QString("connect-response-ipv4-") + QString::number(i))) << responses;
     }
 
-    for (int i = 1; i < connectResponseIPv6.length() - 1; i++) {
+    for (int i = 1; i < connectResponseIPv6.size() - 1; i++) {
         responses.clear();
         responses << authMethodNone << connectResponseIPv6.left(i) << connectResponseIPv6.mid(i);
         QTest::newRow(qPrintable(QString("connect-response-ipv6-") + QString::number(i))) << responses;
@@ -964,13 +966,13 @@ void tst_QSocks5SocketEngine::incomplete_data()
     responses << authMethodBasic << authSuccess.left(1);
     QTest::newRow("auth-response") << responses;
 
-    for (int i = 1; i < connectResponseIPv4.length() - 1; i++) {
+    for (int i = 1; i < connectResponseIPv4.size() - 1; i++) {
         responses.clear();
         responses << authMethodNone << connectResponseIPv4.left(i);
         QTest::newRow(qPrintable(QString("connect-response-ipv4-") + QString::number(i))) << responses;
     }
 
-    for (int i = 1; i < connectResponseIPv6.length() - 1; i++) {
+    for (int i = 1; i < connectResponseIPv6.size() - 1; i++) {
         responses.clear();
         responses << authMethodNone << connectResponseIPv6.left(i);
         QTest::newRow(qPrintable(QString("connect-response-ipv6-") + QString::number(i))) << responses;