From 2b904294a87b303d4f1df03f92dd2c259ff53f00 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 6 Jun 2012 20:04:41 +0200 Subject: 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 --- .../dialogs/qabstractpagesetupdialog.h | 1 + src/printsupport/dialogs/qabstractprintdialog.h | 1 + src/printsupport/dialogs/qprintpreviewdialog.h | 1 + src/printsupport/kernel/kernel.pri | 3 +- src/printsupport/kernel/qpaintengine_alpha_p.h | 1 + src/printsupport/kernel/qplatformprintplugin.h | 1 + src/printsupport/kernel/qprinter.h | 1 + src/printsupport/kernel/qtprintsupportglobal.h | 65 ++++++++++++++++++++++ 8 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 src/printsupport/kernel/qtprintsupportglobal.h (limited to 'src/printsupport') diff --git a/src/printsupport/dialogs/qabstractpagesetupdialog.h b/src/printsupport/dialogs/qabstractpagesetupdialog.h index 7f9286b676..6805db0e17 100644 --- a/src/printsupport/dialogs/qabstractpagesetupdialog.h +++ b/src/printsupport/dialogs/qabstractpagesetupdialog.h @@ -43,6 +43,7 @@ #define QABSTRACTPAGESETUPDIALOG_H #include +#include QT_BEGIN_HEADER diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h index 9d7318eedf..4708695706 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.h +++ b/src/printsupport/dialogs/qabstractprintdialog.h @@ -43,6 +43,7 @@ #define QABSTRACTPRINTDIALOG_H #include +#include QT_BEGIN_HEADER diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h index 18d0fcee1d..1e00930cf9 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.h +++ b/src/printsupport/dialogs/qprintpreviewdialog.h @@ -43,6 +43,7 @@ #define QPRINTPREVIEWDIALOG_H #include +#include #ifndef QT_NO_PRINTPREVIEWDIALOG diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index e53e02bdc5..d3c266ca2d 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -7,7 +7,8 @@ HEADERS += \ $$PWD/qprinterinfo.h \ $$PWD/qprinterinfo_p.h \ $$PWD/qplatformprintplugin.h \ - $$PWD/qplatformprintersupport.h + $$PWD/qplatformprintersupport.h \ + $$PWD/qtprintsupportglobal.h SOURCES += \ $$PWD/qpaintengine_alpha.cpp \ diff --git a/src/printsupport/kernel/qpaintengine_alpha_p.h b/src/printsupport/kernel/qpaintengine_alpha_p.h index d519cc9676..2a5cb7bac2 100644 --- a/src/printsupport/kernel/qpaintengine_alpha_p.h +++ b/src/printsupport/kernel/qpaintengine_alpha_p.h @@ -55,6 +55,7 @@ #ifndef QT_NO_PRINTER #include "private/qpaintengine_p.h" +#include QT_BEGIN_NAMESPACE diff --git a/src/printsupport/kernel/qplatformprintplugin.h b/src/printsupport/kernel/qplatformprintplugin.h index d7abfb65f8..1fa0f52de4 100644 --- a/src/printsupport/kernel/qplatformprintplugin.h +++ b/src/printsupport/kernel/qplatformprintplugin.h @@ -53,6 +53,7 @@ #include #include +#include QT_BEGIN_HEADER diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index 23c7ccc40c..9bd117a9d6 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -45,6 +45,7 @@ #include #include #include +#include QT_BEGIN_HEADER diff --git a/src/printsupport/kernel/qtprintsupportglobal.h b/src/printsupport/kernel/qtprintsupportglobal.h new file mode 100644 index 0000000000..b8eb279797 --- /dev/null +++ b/src/printsupport/kernel/qtprintsupportglobal.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 QTPRINTSUPPORTGLOBAL_H +#define QTPRINTSUPPORTGLOBAL_H + +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# if defined(QT_BUILD_PRINTSUPPORT_LIB) +# define Q_PRINTSUPPORT_EXPORT Q_DECL_EXPORT +# else +# define Q_PRINTSUPPORT_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_PRINTSUPPORT_EXPORT +#endif + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QTPRINTSUPPORTGLOBAL_H -- cgit v1.2.3