From d8fc558550e59128490416955f39d21d66bf2286 Mon Sep 17 00:00:00 2001
From: Tarja Sundqvist <tarja.sundqvist@qt.io>
Date: Fri, 31 Dec 2021 15:32:45 +0200
Subject: Bump version

---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.3


From 63ecc7b14609d3dcdd8e168f1a6f7c46e91b6914 Mon Sep 17 00:00:00 2001
From: Zhang Hao <zhanghao@uniontech.com>
Date: Thu, 27 Jan 2022 13:54:04 +0800
Subject: Check nullptr before using pointer

Calling QRemoteObjectHost::hostUrl() will crash if remoteObjectIO
is nullptr, so check if it's not nullptr before using it.

Fixes: QTBUG-85124
Done-with: sona.kurazyan@qt.io
Change-Id: I1f73589958ba08d3997193653b57a64a223cd201
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
(cherry picked from commit f11c40b55f3657663473865e8b644ed8c963f501)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/remoteobjects/qremoteobjectnode.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp
index 8071521..b9638e8 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();
 }
 
 /*!
-- 
cgit v1.2.3


From 59426d02c3d238cee336112596e5821207783932 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Thu, 17 Feb 2022 16:45:01 +0100
Subject: qconnection_qnx_global_p.h: add missing Qt namespace

Exported or not, the library should not claim names like Thread in the
global namespace if the user asked for a namespaced Qt build.

Change-Id: I31fc715a70923ab85d82c3407ca89c6b087eb19e
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 5d2dad5e4f06b8ff1e2f368a6b359408806edd2a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/remoteobjects/qconnection_qnx_global_p.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/remoteobjects/qconnection_qnx_global_p.h b/src/remoteobjects/qconnection_qnx_global_p.h
index 4d300fe..0c9b48f 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
 
-- 
cgit v1.2.3