From 413c8841aa0eca33c1c0a37ccb901597e16e9e8a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 7 Jun 2012 14:34:47 +0200 Subject: [PATCH] Remove the Q_xxx_EXPORT macros of other modules from qglobal.h The macros have been moved to their respective modules. Change-Id: I653668b608cd3b79824a25b0e7b1c238330c0007 Reviewed-by: Oswald Buddenhagen --- src/corelib/global/qglobal.h | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 77aecc6..43758eb 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -505,43 +505,12 @@ class QDataStream; # else # define Q_NETWORK_EXPORT Q_DECL_IMPORT # endif - -// ### Remove the following once their modules have been updated -# if defined(QT_BUILD_SVG_LIB) -# define Q_SVG_EXPORT Q_DECL_EXPORT -# else -# define Q_SVG_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_MULTIMEDIA_LIB) -# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT -# else -# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_XMLPATTERNS_LIB) -# define Q_XMLPATTERNS_EXPORT Q_DECL_EXPORT -# else -# define Q_XMLPATTERNS_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_SCRIPT_LIB) -# define Q_SCRIPT_EXPORT Q_DECL_EXPORT -# else -# define Q_SCRIPT_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_SCRIPTTOOLS_LIB) -# define Q_SCRIPTTOOLS_EXPORT Q_DECL_EXPORT -# else -# define Q_SCRIPTTOOLS_EXPORT Q_DECL_IMPORT -# endif # endif #else # define Q_CORE_EXPORT # define Q_GUI_EXPORT # define Q_WIDGETS_EXPORT # define Q_NETWORK_EXPORT -# define Q_SVG_EXPORT -# define Q_MULTIMEDIA_EXPORT -# define Q_SCRIPT_EXPORT -# define Q_SCRIPTTOOLS_EXPORT #endif /* -- 2.7.4