summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-06-07 14:34:47 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-09 03:26:13 +0200
commit413c8841aa0eca33c1c0a37ccb901597e16e9e8a (patch)
tree66deb8401715bd6ff81d66c9c05fb85878b12145 /src/corelib/global/qglobal.h
parent703e28728346edfccd610a926efb9a584b8f133b (diff)
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 <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r--src/corelib/global/qglobal.h31
1 files changed, 0 insertions, 31 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 77aecc6db5..43758eb844 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
/*