From 229ed9d9d014b7b8c66ef4aaf84eb514d5fd6be2 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 7 Jun 2012 14:17:07 +0200
Subject: Add qtsvgglobal.h containing the Q_SVG_EXPORT macro.

No library other than the core libraries should depend on their
export macros being in qglobal.h.

Change-Id: Ia4b2c9645d27424c6f1c80163c27a8aad95cf076
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 src/svg/qgraphicssvgitem.h   |  2 ++
 src/svg/qsvggenerator.h      |  1 +
 src/svg/qsvgrenderer.h       |  1 +
 src/svg/qsvgtinydocument_p.h |  1 +
 src/svg/qsvgwidget.h         |  2 ++
 src/svg/qtsvgglobal.h        | 67 ++++++++++++++++++++++++++++++++++++++++++++
 src/svg/svg.pro              |  3 +-
 7 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 src/svg/qtsvgglobal.h

(limited to 'src')

diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index b8e8b9d..abea46f 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -47,6 +47,8 @@
 
 #include <QtWidgets/qgraphicsitem.h>
 
+#include <QtSvg/qtsvgglobal.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h
index a0cccb9..02cad10 100644
--- a/src/svg/qsvggenerator.h
+++ b/src/svg/qsvggenerator.h
@@ -50,6 +50,7 @@
 #include <QtCore/qiodevice.h>
 #include <QtCore/qobjectdefs.h>
 #include <QtCore/qscopedpointer.h>
+#include <QtSvg/qtsvgglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h
index 91dde9b..2ccdd8b 100644
--- a/src/svg/qsvgrenderer.h
+++ b/src/svg/qsvgrenderer.h
@@ -50,6 +50,7 @@
 #include <QtCore/qsize.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qxmlstream.h>
+#include <QtSvg/qtsvgglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h
index 321d96b..58de2c6 100644
--- a/src/svg/qsvgtinydocument_p.h
+++ b/src/svg/qsvgtinydocument_p.h
@@ -54,6 +54,7 @@
 //
 
 #include "qsvgstructure_p.h"
+#include "qtsvgglobal.h"
 
 #ifndef QT_NO_SVG
 
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h
index 4594a84..c527913 100644
--- a/src/svg/qsvgwidget.h
+++ b/src/svg/qsvgwidget.h
@@ -48,6 +48,8 @@
 
 #include <QtWidgets/qwidget.h>
 
+#include <QtSvg/qtsvgglobal.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/svg/qtsvgglobal.h b/src/svg/qtsvgglobal.h
new file mode 100644
index 0000000..bd98f06
--- /dev/null
+++ b/src/svg/qtsvgglobal.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 QTSVGGLOBAL_H
+#define QTSVGGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+#ifndef Q_SVG_EXPORT
+#  ifndef QT_STATIC
+#    if defined(QT_BUILD_SVG_LIB)
+#      define Q_SVG_EXPORT Q_DECL_EXPORT
+#    else
+#      define Q_SVG_EXPORT Q_DECL_IMPORT
+#    endif
+#  else
+#    define Q_SVG_EXPORT
+#  endif
+#endif
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index 09bef40..d7132af 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -21,7 +21,8 @@ HEADERS += \
 	qsvgrenderer.h          \
     qsvgwidget.h            \
     qgraphicssvgitem.h      \
-    qsvggenerator.h
+    qsvggenerator.h \
+    qtsvgglobal.h
 
 
 SOURCES += \
-- 
cgit v1.2.1