diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-06 20:04:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 00:27:18 +0200 |
| commit | 2b904294a87b303d4f1df03f92dd2c259ff53f00 (patch) | |
| tree | 2a4acef7efcabe7d0d03eb978b61b1672880c8ad /src/corelib | |
| parent | 92283176ac3ab537b589dd6530fc7849adf5cae4 (diff) | |
Clean up the EXPORT macros in qglobal.h.
QtPlatformSupport is a static library. It should never export
anything, so Q_PLATFORMSUPPORT_EXPORT is unnecessary.
QtSql, QtXml, QtDBus, QtOpenGL and QtPrintSupport now have the macros
on their own source trees. It's possible these modules might be
separated out from qtbase in the future. For QtDBus, the macros are
moving back to where they used to be. This also leaves qglobal.h only
creating the macros for QtCore, QtGui, QtWidgets and QtNetwork, the
core libraries.
Q_CANVAS_EXPORT, Q_OPENVG_EXPORT and Q_COMPAT_EXPORT aren't used
anywhere in the Qt sources, so simply delete them. And the
Q_QUICK1_EXPORT macro in the static section was wrong, so remove it
too.
Change-Id: I50bdf86e783338f814903b25979721f788a7becf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 59 |
1 files changed, 3 insertions, 56 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 1710e7bb3e..77aecc6db5 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Intel Corporation. ** Contact: http://www.qt-project.org/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -499,51 +500,23 @@ class QDataStream; # else # define Q_WIDGETS_EXPORT Q_DECL_IMPORT # endif -# if defined(QT_BUILD_PLATFORMSUPPORT_LIB) -# define Q_PLATFORMSUPPORT_EXPORT Q_DECL_EXPORT -# else -# define Q_PLATFORMSUPPORT_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_PRINTSUPPORT_LIB) -# define Q_PRINTSUPPORT_EXPORT Q_DECL_EXPORT -# else -# define Q_PRINTSUPPORT_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_SQL_LIB) -# define Q_SQL_EXPORT Q_DECL_EXPORT -# else -# define Q_SQL_EXPORT Q_DECL_IMPORT -# endif # if defined(QT_BUILD_NETWORK_LIB) # define Q_NETWORK_EXPORT Q_DECL_EXPORT # 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_OPENGL_LIB) -# define Q_OPENGL_EXPORT Q_DECL_EXPORT -# else -# define Q_OPENGL_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_OPENVG_LIB) -# define Q_OPENVG_EXPORT Q_DECL_EXPORT -# else -# define Q_OPENVG_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_XML_LIB) -# define Q_XML_EXPORT Q_DECL_EXPORT -# else -# define Q_XML_EXPORT Q_DECL_IMPORT -# endif # if defined(QT_BUILD_XMLPATTERNS_LIB) # define Q_XMLPATTERNS_EXPORT Q_DECL_EXPORT # else @@ -559,42 +532,16 @@ class QDataStream; # else # define Q_SCRIPTTOOLS_EXPORT Q_DECL_IMPORT # endif -# if defined(QT_BUILD_CANVAS_LIB) -# define Q_CANVAS_EXPORT Q_DECL_EXPORT -# else -# define Q_CANVAS_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_COMPAT_LIB) -# define Q_COMPAT_EXPORT Q_DECL_EXPORT -# else -# define Q_COMPAT_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_DBUS_LIB) -# define Q_DBUS_EXPORT Q_DECL_EXPORT -# else -# define Q_DBUS_EXPORT Q_DECL_IMPORT -# endif # endif #else # define Q_CORE_EXPORT # define Q_GUI_EXPORT # define Q_WIDGETS_EXPORT -# define Q_PLATFORMSUPPORT_EXPORT -# define Q_PRINTSUPPORT_EXPORT -# define Q_SQL_EXPORT # define Q_NETWORK_EXPORT # define Q_SVG_EXPORT -# define Q_QUICK1_EXPORT -# define Q_DECLARATIVE_EXPORT -# define Q_OPENGL_EXPORT # define Q_MULTIMEDIA_EXPORT -# define Q_OPENVG_EXPORT -# define Q_XML_EXPORT # define Q_SCRIPT_EXPORT # define Q_SCRIPTTOOLS_EXPORT -# define Q_CANVAS_EXPORT -# define Q_COMPAT_EXPORT -# define Q_DBUS_EXPORT #endif /* |