diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:24 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:24 +0200 |
| commit | 27b496d5aff650e4cf9a3148857c723dce10ef25 (patch) | |
| tree | 82789b553c90f415f80d2cd81bd65f805be4855e | |
| parent | 929c7ad0676f084b9ecc469cd47a307596923cb3 (diff) | |
| parent | 59426d02c3d238cee336112596e5821207783932 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Change-Id: I6eb9f9d0d9d29d6d894ba40c3b8f324c9e2fa593
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/remoteobjects/qconnection_qnx_global_p.h | 4 | ||||
| -rw-r--r-- | src/remoteobjects/qremoteobjectnode.cpp | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 2120d27..4bf58c5 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 = 5.15.8 +MODULE_VERSION = 5.15.9 QTRO_SOURCE_TREE = $$PWD diff --git a/src/remoteobjects/qconnection_qnx_global_p.h b/src/remoteobjects/qconnection_qnx_global_p.h index cf108ee..bf87431 100644 --- a/src/remoteobjects/qconnection_qnx_global_p.h +++ b/src/remoteobjects/qconnection_qnx_global_p.h @@ -75,6 +75,8 @@ #define FATAL_ON_ERROR(cmd, ...) if (cmd(__VA_ARGS__) == -1) qFatal("Error %s: %s %s %s %d", \ #cmd, strerror(errno), Q_FUNC_INFO, __FILE__, __LINE__); +QT_BEGIN_NAMESPACE + const int MAX_RETRIES = 3; enum MsgType : uint16_t { REPLICA_INIT = _IO_MAX+100, @@ -110,5 +112,7 @@ private: T *m_obj; }; +QT_END_NAMESPACE + #endif // QNXIPCPRIVATE_GLOBAL_H diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp index 4b883dc..bf887e3 100644 --- a/src/remoteobjects/qremoteobjectnode.cpp +++ b/src/remoteobjects/qremoteobjectnode.cpp @@ -1784,7 +1784,9 @@ void QRemoteObjectHostBase::setName(const QString &name) QUrl QRemoteObjectHostBase::hostUrl() const { Q_D(const QRemoteObjectHostBase); - return d->remoteObjectIo->serverAddress(); + if (d->remoteObjectIo) + return d->remoteObjectIo->serverAddress(); + return QUrl(); } /*! |