diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-05-15 12:51:31 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-27 04:43:48 +0000 |
| commit | e5b25862ff00c390a7df19f8b0068dc1e0bb1f57 (patch) | |
| tree | 2434a3309be8fb6895c80205bee15bf3fcf31987 /src/corelib | |
| parent | 70d3e15c31aa2fefacda8c261faee73ab4b5f05c (diff) | |
Fix build error on iOS with the configure option -qtnamespace
qtbase/src/corelib/kernel/qsharedmemory_p.h:62:33: error:
unknown type name 'QString'; did you mean 'XXXX::QString'?
int createUnixKeyFile(const QString &fileName);
^~~~~~~
XXXX::QString
Change-Id: I455526503f059efc2f496b159b4cb098385dda00
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit d81a9206ac528ad7b5093305d7fe0037053468b8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_p.h | 10 | ||||
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_systemv.cpp | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h index a248937037..e06e7e86f3 100644 --- a/src/corelib/kernel/qsharedmemory_p.h +++ b/src/corelib/kernel/qsharedmemory_p.h @@ -56,14 +56,20 @@ #include <QtCore/qstring.h> #ifdef QT_NO_SHAREDMEMORY -# ifndef QT_NO_SYSTEMSEMAPHORE +# ifndef QT_NO_SYSTEMSEMAPHORE + +QT_BEGIN_NAMESPACE + namespace QSharedMemoryPrivate { int createUnixKeyFile(const QString &fileName); QString makePlatformSafeKey(const QString &key, const QString &prefix = QLatin1String("qipc_sharedmemory_")); } -#endif + +QT_END_NAMESPACE + +# endif #else #include "qsystemsemaphore.h" diff --git a/src/corelib/kernel/qsharedmemory_systemv.cpp b/src/corelib/kernel/qsharedmemory_systemv.cpp index 8149f20724..65ad23b9f6 100644 --- a/src/corelib/kernel/qsharedmemory_systemv.cpp +++ b/src/corelib/kernel/qsharedmemory_systemv.cpp @@ -109,7 +109,7 @@ key_t QSharedMemoryPrivate::handle() 0 already existed 1 created */ -int QSharedMemoryPrivate::createUnixKeyFile(const QString &fileName) +int QT_PREPEND_NAMESPACE(QSharedMemoryPrivate)::createUnixKeyFile(const QString &fileName) { int fd = qt_safe_open(QFile::encodeName(fileName).constData(), O_EXCL | O_CREAT | O_RDWR, 0640); |