diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-07 14:33:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 10:53:44 +0200 |
commit | 8aa3b1b318bdf5b9a67b676f786932c8e54daede (patch) | |
tree | e921c27c1882f50da41576d7c3cf5d09405bd139 /src | |
parent | a50233a763eabcd5aa2d9cc2baa4f4d9221b5d7f (diff) | |
download | qtxmlpatterns-8aa3b1b318bdf5b9a67b676f786932c8e54daede.tar.gz qtxmlpatterns-8aa3b1b318bdf5b9a67b676f786932c8e54daede.tar.bz2 qtxmlpatterns-8aa3b1b318bdf5b9a67b676f786932c8e54daede.zip |
Add qtxmlpatternsglobal.h containing the Q_XMLPATTERNS_EXPORT macro
No library other than the core libraries should depend on their
export macros being in qglobal.h.
Change-Id: Iecf077e39673eb4d64dd96b79fda2012490b6a59
Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/xmlpatterns/api/api.pri | 1 | ||||
-rw-r--r-- | src/xmlpatterns/api/qabstracturiresolver.h | 1 | ||||
-rw-r--r-- | src/xmlpatterns/api/qsourcelocation.h | 1 | ||||
-rw-r--r-- | src/xmlpatterns/api/qtxmlpatternsglobal.h | 67 | ||||
-rw-r--r-- | src/xmlpatterns/api/qxmlname.h | 1 | ||||
-rw-r--r-- | src/xmlpatterns/api/qxmlnamepool.h | 1 | ||||
-rw-r--r-- | src/xmlpatterns/api/qxmlresultitems.h | 1 |
7 files changed, 73 insertions, 0 deletions
diff --git a/src/xmlpatterns/api/api.pri b/src/xmlpatterns/api/api.pri index a0adf75..82d1c03 100644 --- a/src/xmlpatterns/api/api.pri +++ b/src/xmlpatterns/api/api.pri @@ -13,6 +13,7 @@ HEADERS += $$PWD/qabstractxmlforwarditerator_p.h \ $$PWD/qresourcedelegator_p.h \ $$PWD/qsimplexmlnodemodel.h \ $$PWD/qsourcelocation.h \ + $$PWD/qtxmlpatternsglobal.h \ $$PWD/quriloader_p.h \ $$PWD/qvariableloader_p.h \ $$PWD/qxmlformatter.h \ diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h index b995537..16b7a9e 100644 --- a/src/xmlpatterns/api/qabstracturiresolver.h +++ b/src/xmlpatterns/api/qabstracturiresolver.h @@ -43,6 +43,7 @@ #define QABSTRACTURIRESOLVER_H #include <QtCore/QObject> +#include <QtXmlPatterns/qtxmlpatternsglobal.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qsourcelocation.h b/src/xmlpatterns/api/qsourcelocation.h index 7411f19..2fc6d81 100644 --- a/src/xmlpatterns/api/qsourcelocation.h +++ b/src/xmlpatterns/api/qsourcelocation.h @@ -44,6 +44,7 @@ #include <QtCore/QMetaType> #include <QtCore/QUrl> +#include <QtXmlPatterns/qtxmlpatternsglobal.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/api/qtxmlpatternsglobal.h b/src/xmlpatterns/api/qtxmlpatternsglobal.h new file mode 100644 index 0000000..76bbc35 --- /dev/null +++ b/src/xmlpatterns/api/qtxmlpatternsglobal.h @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** 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 QTXMLPATTERNSGLOBAL_H +#define QTXMLPATTERNSGLOBAL_H + +#include <QtCore/qglobal.h> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +#ifndef Q_XMLPATTERNS_EXPORT +# ifndef QT_STATIC +# if defined(QT_BUILD_XMLPATTERNS_LIB) +# define Q_XMLPATTERNS_EXPORT Q_DECL_EXPORT +# else +# define Q_XMLPATTERNS_EXPORT Q_DECL_IMPORT +# endif +# else +# define Q_XMLPATTERNS_EXPORT +# endif +#endif + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif diff --git a/src/xmlpatterns/api/qxmlname.h b/src/xmlpatterns/api/qxmlname.h index 0e79824..ceb79d1 100644 --- a/src/xmlpatterns/api/qxmlname.h +++ b/src/xmlpatterns/api/qxmlname.h @@ -44,6 +44,7 @@ #include <QtCore/QString> #include <QtCore/QMetaType> +#include <QtXmlPatterns/qtxmlpatternsglobal.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/api/qxmlnamepool.h b/src/xmlpatterns/api/qxmlnamepool.h index a504c32..dc71c27 100644 --- a/src/xmlpatterns/api/qxmlnamepool.h +++ b/src/xmlpatterns/api/qxmlnamepool.h @@ -44,6 +44,7 @@ #include <QtCore/QSharedData> #include <QtCore/QString> +#include <QtXmlPatterns/qtxmlpatternsglobal.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/api/qxmlresultitems.h b/src/xmlpatterns/api/qxmlresultitems.h index 98ab432..4b192cd 100644 --- a/src/xmlpatterns/api/qxmlresultitems.h +++ b/src/xmlpatterns/api/qxmlresultitems.h @@ -44,6 +44,7 @@ #include <QtCore/QString> #include <QtCore/QScopedPointer> +#include <QtXmlPatterns/qtxmlpatternsglobal.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE |