diff options
| author | Iain <qt-info@nokia.com> | 2009-06-25 19:51:17 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-08-19 06:54:06 (GMT) |
| commit | d40e4ea9feb3fa880c01dccb8fcc254b0f79d41f (patch) | |
| tree | 3f91a0fadeac9be193f42f823081b9abd3b17f51 | |
| parent | 3938464eb37a395acfd135e66c722eddf6d6ed1a (diff) | |
| download | Qt-d40e4ea9feb3fa880c01dccb8fcc254b0f79d41f.zip Qt-d40e4ea9feb3fa880c01dccb8fcc254b0f79d41f.tar.gz Qt-d40e4ea9feb3fa880c01dccb8fcc254b0f79d41f.tar.bz2 | |
New definition for ...EXPORT_INLINE to deal with the way we drive RVCT
| -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 36dd863..9dc4cd9 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1331,6 +1331,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 |