diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-04-26 13:00:56 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-26 15:33:00 +0200 |
| commit | f3721d77067d4d0f81971a4bfb1bb135bf146d8a (patch) | |
| tree | 33dbdff4faa162c5158fc5bf531b486213d4ded6 /src/corelib/global/qglobal.h | |
| parent | 93132154b5283bf26baee47c60471a245884382f (diff) | |
get rid of Q_*_EXPORT_INLINE macros
> Girish:
> We should be able to remove the macro completely today,
> just mark all those functions as plain inline.
> With Qt5, we don't have to worry about bc yet.
this fixes "import attribute ignored" warnings on mingw with -fno-keep-inline-dllexport
Change-Id: I616e5de7c8d59953ce03a316b941a439fae56298
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 114857b32b..5f2445f930 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -634,58 +634,6 @@ class QDataStream; # endif #endif -// Functions marked as Q_GUI_EXPORT_INLINE were exported and inlined by mistake. -// Compilers like MinGW complain that the import attribute is ignored. -#if defined(Q_CC_MINGW) -# if defined(QT_BUILD_CORE_LIB) -# define Q_CORE_EXPORT_INLINE Q_CORE_EXPORT inline -# else -# define Q_CORE_EXPORT_INLINE inline -# endif -# if defined(QT_BUILD_GUI_LIB) -# define Q_GUI_EXPORT_INLINE Q_GUI_EXPORT inline -# else -# define Q_GUI_EXPORT_INLINE inline -# endif -# if defined(QT_BUILD_WIDGETS_LIB) -# define Q_WIDGETS_EXPORT_INLINE Q_WIDGETS_EXPORT inline -# else -# define Q_WIDGETS_EXPORT_INLINE inline -# endif -# if defined(QT_BUILD_PLATFORMSUPPORT_LIB) -# define Q_PLATFORMSUPPORT_EXPORT_INLINE Q_PLATFORMSUPPORT_EXPORT inline -# else -# define Q_PLATFORMSUPPORT_EXPORT_INLINE inline -# endif -# if defined(QT_BUILD_PRINTSUPPORT_LIB) -# define Q_PRINTSUPPORT_EXPORT_INLINE Q_PRINTSUPPORT_EXPORT inline -# else -# define Q_PRINTSUPPORT_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_WIDGETS_EXPORT_INLINE inline -# define Q_PLATFORMSUPPORT_EXPORT_INLINE inline -# define Q_PRINTSUPPORT_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_WIDGETS_EXPORT_INLINE Q_WIDGETS_EXPORT inline -# define Q_PLATFORMSUPPORT_EXPORT_INLINE Q_PLATFORMSUPPORT_EXPORT inline -# define Q_PRINTSUPPORT_EXPORT_INLINE Q_PRINTSUPPORT_EXPORT inline -# define Q_COMPAT_EXPORT_INLINE Q_COMPAT_EXPORT inline -#endif - /* No, this is not an evil backdoor. QT_BUILD_INTERNAL just exports more symbols for Qt's internal unit tests. If you want slower loading times and more |