diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-02-28 13:00:19 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-20 02:09:26 +0200 |
| commit | 62d636a666f38fb4483e2d528f1e175c90f5272a (patch) | |
| tree | 20b11b55e659585973fba46cccec808544cb9e9d /src/corelib/global/qglobal.h | |
| parent | 3fdf69b599457bf32a6620d66faefb940fd21c93 (diff) | |
Add a Mach-O decoder to the QPluginLoader
We already had an ELF decoder, which helped us greatly to find the
metadata and that catches most Unix systems (Solaris, QNX, HP-UXi, and
all of the free Unixes). On other Unix systems, aside from Mac OS X,
we simply scanned the entire file for the signature. On Windows, even
without a COFF-PE decoder, we use a LoadLibrary trick to load the
plugin without loading the dependent libraries. In most cases, that
works.
Unfortunately, on Mac OS X we didn't have a decoder and nor could we
do the file scan: because Mac OS X binaries could be fat binaries, we
wouldn't know which architecture's signature we had found.
No more. This adds a full Mach-O decoder to QtCore. It is also capable
of finding the boundaries of the architecture's binary, but that
functionality is disabled since all Qt 5 plugins have plugin metadata
sections.
Change-Id: I2d5c04c5ecf024864b8a43f31ab6b7e6c5eae9ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 2132e555cd..f9629ff430 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -74,6 +74,9 @@ #if defined (__ELF__) # define Q_OF_ELF #endif +#if defined (__MACH__) && defined (__APPLE__) +# define Q_OF_MACH_O +#endif #ifdef __cplusplus |