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/xml | |
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/xml')
-rw-r--r-- | src/xml/dom/qdom.h | 1 | ||||
-rw-r--r-- | src/xml/qtxmlglobal.h | 65 | ||||
-rw-r--r-- | src/xml/sax/qxml.h | 1 | ||||
-rw-r--r-- | src/xml/xml.pro | 1 |
4 files changed, 68 insertions, 0 deletions
diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h index 34c4b00636..d0d375b87d 100644 --- a/src/xml/dom/qdom.h +++ b/src/xml/dom/qdom.h @@ -42,6 +42,7 @@ #ifndef QDOM_H #define QDOM_H +#include <QtXml/qtxmlglobal.h> #include <QtCore/qstring.h> QT_BEGIN_HEADER diff --git a/src/xml/qtxmlglobal.h b/src/xml/qtxmlglobal.h new file mode 100644 index 0000000000..030143aacf --- /dev/null +++ b/src/xml/qtxmlglobal.h @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Intel Corporation. +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTXMLGLOBAL_H +#define QTXMLGLOBAL_H + +#include <QtCore/qglobal.h> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# if defined(QT_BUILD_XML_LIB) +# define Q_XML_EXPORT Q_DECL_EXPORT +# else +# define Q_XML_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_XML_EXPORT +#endif + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QTXMLGLOBAL_H diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index 62102c29e7..a714681bb4 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -42,6 +42,7 @@ #ifndef QXML_H #define QXML_H +#include <QtXml/qtxmlglobal.h> #include <QtCore/qtextstream.h> #include <QtCore/qfile.h> #include <QtCore/qstring.h> diff --git a/src/xml/xml.pro b/src/xml/xml.pro index 5f4d844ea5..3899033fbb 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -8,6 +8,7 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 load(qt_module_config) +HEADERS += qtxmlglobal.h QMAKE_DOCS = $$PWD/doc/qtxml.qdocconf QMAKE_DOCS_INDEX = ../../doc |