diff options
| author | Iain <qt-info@nokia.com> | 2009-08-21 14:16:47 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-08-21 14:16:47 (GMT) |
| commit | 6263cef1bb703e7c78cd1896efb950fe0ec4d56f (patch) | |
| tree | 70f1f8919cfe7ec7ea33b55752b109caeedb3c41 /src/corelib/global | |
| parent | ae42be87658ad97fad48706141779ec42c02212e (diff) | |
| parent | d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5 (diff) | |
| download | Qt-6263cef1bb703e7c78cd1896efb950fe0ec4d56f.zip Qt-6263cef1bb703e7c78cd1896efb950fe0ec4d56f.tar.gz Qt-6263cef1bb703e7c78cd1896efb950fe0ec4d56f.tar.bz2 | |
Merge branch 'symbolVisibility'
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 7dbbc1b..93cc30f 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1325,6 +1325,12 @@ class QDataStream; # else # define Q_GUI_EXPORT_INLINE inline # endif +#elif defined(Q_CC_RVCT) +// we force RVCT not to export inlines by passing --visibility_inlines_hidden +// so we need to just inline it, rather than exporting and inlining +// note: this affects the contents of the DEF files (ie. these functions do not appear) +# define Q_CORE_EXPORT_INLINE inline +# define Q_GUI_EXPORT_INLINE inline #else # define Q_CORE_EXPORT_INLINE Q_CORE_EXPORT inline # define Q_GUI_EXPORT_INLINE Q_GUI_EXPORT inline |