diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-12-16 14:14:39 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-12-16 14:14:39 +0200 |
| commit | 4388c0ac05f290b1707e9f7d25c7cc68dd61f728 (patch) | |
| tree | ddf53cc6e83525adc261d07be258ddfb680d39d1 | |
| parent | 4a39f2a3068e9d8e460ecb9dd04353227ad2bbaf (diff) | |
| parent | 069154949775b2edbc835e4812713c07fdd56642 (diff) | |
Merge tag 'v6.2.11-lts' into tqtc/lts-6.2-opensourcev6.2.11-lts-lgpl
Qt 6.2.11-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I79d0ee0bbb1b7fbe4b8122944bd7429b6be202e7
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/remoteobjects/qconnection_tcpip_backend.cpp | 17 |
3 files changed, 11 insertions, 10 deletions
diff --git a/.cmake.conf b/.cmake.conf index 31a36e3..842b347 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.10") +set(QT_REPO_MODULE_VERSION "6.2.11") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index a8079df..5e5a84e 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,6 +4,6 @@ CONFIG += qt_example_installs DEFINES += QT_NO_JAVA_STYLE_ITERATORS DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.10 +MODULE_VERSION = 6.2.11 QTRO_SOURCE_TREE = $$PWD diff --git a/src/remoteobjects/qconnection_tcpip_backend.cpp b/src/remoteobjects/qconnection_tcpip_backend.cpp index 5371aa6..c49f296 100644 --- a/src/remoteobjects/qconnection_tcpip_backend.cpp +++ b/src/remoteobjects/qconnection_tcpip_backend.cpp @@ -81,14 +81,15 @@ void TcpClientIo::connectToServer() { if (isOpen()) return; - QHostAddress address(url().host()); - if (address.isNull()) { - const QList<QHostAddress> addresses = QHostInfo::fromName(url().host()).addresses(); - Q_ASSERT_X(addresses.size() >= 1, Q_FUNC_INFO, url().toString().toLatin1().data()); - address = addresses.first(); - } - - m_socket->connectToHost(address, quint16(url().port())); + const QString &host = url().host(); + QHostAddress address(host); + if (address.isNull()) + address = QHostInfo::fromName(host).addresses().value(0); + + if (address.isNull()) + qWarning("connectToServer(): Failed to resolve host %s", qUtf8Printable(host)); + else + m_socket->connectToHost(address, url().port()); } bool TcpClientIo::isOpen() const |