diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 15:08:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 15:08:09 (GMT) |
| commit | 1c4846bc35613f388fda28841e19c3a9cbc8c11f (patch) | |
| tree | db6093dd10f7a0d54649feb285b27aa037373c09 /src/corelib/global | |
| parent | dbfedcb31961579499fcb5342ccc42311191bcd4 (diff) | |
| parent | e5d3dcc188439321e129406cb14a51e60a19b727 (diff) | |
| download | Qt-1c4846bc35613f388fda28841e19c3a9cbc8c11f.zip Qt-1c4846bc35613f388fda28841e19c3a9cbc8c11f.tar.gz Qt-1c4846bc35613f388fda28841e19c3a9cbc8c11f.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Qt3 Support headers: Avoid warnings from mingw g++
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 7359b6d..26d9e7d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1353,15 +1353,22 @@ class QDataStream; # else # define Q_GUI_EXPORT_INLINE inline # endif +# if defined(QT_BUILD_COMPAT_LIB) +# define Q_COMPAT_EXPORT_INLINE Q_COMPAT_EXPORT inline +# else +# define Q_COMPAT_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 +# define Q_COMPAT_EXPORT_INLINE inline #else # define Q_CORE_EXPORT_INLINE Q_CORE_EXPORT inline # define Q_GUI_EXPORT_INLINE Q_GUI_EXPORT inline +# define Q_COMPAT_EXPORT_INLINE Q_COMPAT_EXPORT inline #endif /* |