diff options
| author | Tero Alamäki <tero.alamaki@qt.io> | 2017-07-27 11:43:38 +0300 |
|---|---|---|
| committer | Tero Alamaki <tero.alamaki@qt.io> | 2017-08-10 12:20:33 +0000 |
| commit | f4e0ffb11c158908cfc33df1e06fcd032501ef1c (patch) | |
| tree | b7de5c6168b37248e875cd01b2c6f0f03a64e039 /src/corelib/global | |
| parent | ee29be91c0b77d12f913f8f0b8d3f0d11a3a40fa (diff) | |
Enable custom shared memory schemes on INTEGRITY
Replaced dependency to libdl.a with libshm_client.a. Defined symbols
'shm_area_password' and 'shm_area_name' internally. The build for
INTEGRITY is static only so libdl.a is not needed.
Change-Id: I7e34528835132d79ea582a30cf9ff61cdda198da
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 4223d2a3e1..12e908f09f 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -95,6 +95,19 @@ #include <sys/sysctl.h> #endif +#if defined(Q_OS_INTEGRITY) +extern "C" { + // Function mmap resides in libshm_client.a. To be able to link with it one needs + // to define symbols 'shm_area_password' and 'shm_area_name', because the library + // is meant to allow the application that links to it to use POSIX shared memory + // without full system POSIX. +# pragma weak shm_area_password +# pragma weak shm_area_name + char *shm_area_password = "dummy"; + char *shm_area_name = "dummy"; +} +#endif + #include "archdetect.cpp" #ifdef qFatal |