diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-22 11:01:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 23:31:22 +0200 |
| commit | d4f8dfb708eff587050c8caccbb06a714d7a93f8 (patch) | |
| tree | 95736afc64c654d33c99242ce65c8406314fcfd9 | |
| parent | 620572237c9bbab6cd049a1259fc3184e8b20f73 (diff) | |
Update the export macros in qtdocgallery.git
Use the new, simpler QT_STATIC macro.
Change-Id: If31ebb8801e27d911a443adbeb08f1196b63d186
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/gallery/qgalleryglobal.h | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/src/gallery/qgalleryglobal.h b/src/gallery/qgalleryglobal.h index 6a95e78..1104e05 100644 --- a/src/gallery/qgalleryglobal.h +++ b/src/gallery/qgalleryglobal.h @@ -55,30 +55,14 @@ #include <QtCore/qglobal.h> -#if defined(Q_OS_WIN) -# if defined(QT_NODLL) -# undef QT_MAKEDLL -# undef QT_DLL -# elif defined(QT_MAKEDLL) -# if defined(QT_DLL) -# undef QT_DLL -# endif -# if defined(QT_BUILD_ADDON_GALLERY_LIB) -# define Q_GALLERY_EXPORT Q_DECL_EXPORT -# else -# define Q_GALLERY_EXPORT Q_DECL_IMPORT -# endif -# elif defined(QT_DLL) -# define Q_GALLERY_EXPORT Q_DECL_IMPORT -# endif -#endif - -#if !defined(Q_GALLERY_EXPORT) -# if defined(QT_SHARED) +#ifndef QT_STATIC +# if defined(QT_BUILD_ADDON_GALLERY_LIB) # define Q_GALLERY_EXPORT Q_DECL_EXPORT # else -# define Q_GALLERY_EXPORT +# define Q_GALLERY_EXPORT Q_DECL_IMPORT # endif +#else +# define Q_GALLERY_EXPORT #endif #define QT_ADDON_GALLERY_BEGIN_NAMESPACE namespace QtAddOn { namespace Gallery { |