diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-02-17 16:45:01 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-18 15:17:44 +0000 |
| commit | 59426d02c3d238cee336112596e5821207783932 (patch) | |
| tree | 6fab8a284a6a66974c18b8a6388dbfcdf12d0257 | |
| parent | 63ecc7b14609d3dcdd8e168f1a6f7c46e91b6914 (diff) | |
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>
| -rw-r--r-- | src/remoteobjects/qconnection_qnx_global_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 |