diff options
author | Liang Qi <liang.qi@qt.io> | 2019-06-20 07:50:44 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-06-20 07:50:44 +0200 |
commit | bd9959bde290168b0635cb878d7d189e1f9c4b4f (patch) | |
tree | 1a4d5a0eff8d6acaff26ae4ff4ded8ca71b76a06 /tests/auto/network/access/qftp/tst_qftp.cpp | |
parent | b877285694501d16b2bb0dc8d1a92e185b079b87 (diff) | |
parent | 6398588338dfea4161704e01216ba70b216a7a0b (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/gui/painting/qdrawhelper.cpp
src/network/ssl/qsslsocket_openssl.cpp
src/widgets/styles/qstylesheetstyle.cpp
Change-Id: Ibe1cd40f46a823c9e5edbe0a3cd16be1e1686b17
Diffstat (limited to 'tests/auto/network/access/qftp/tst_qftp.cpp')
-rw-r--r-- | tests/auto/network/access/qftp/tst_qftp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp index 6e18e1a663..1a8f264c28 100644 --- a/tests/auto/network/access/qftp/tst_qftp.cpp +++ b/tests/auto/network/access/qftp/tst_qftp.cpp @@ -2342,7 +2342,7 @@ void tst_QFtp::loginURL() ftp = newFtp(); addCommand(QFtp::ConnectToHost, - ftp->connectToHost(QHostInfo::localHostName(), port)); + ftp->connectToHost("127.0.0.1", port)); addCommand(QFtp::Login, ftp->login(user, password)); QTestEventLoop::instance().enterLoop(5); @@ -2350,7 +2350,7 @@ void tst_QFtp::loginURL() ftp = nullptr; server.stopServer(); if (QTestEventLoop::instance().timeout()) - QFAIL(msgTimedOut(QHostInfo::localHostName(), port)); + QFAIL(msgTimedOut("127.0.0.1", port)); QCOMPARE(server.getRawUser(), rawUser); QCOMPARE(server.getRawPassword(), rawPass); |