summaryrefslogtreecommitdiffstats
path: root/src/printsupport/dialogs
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-06-06 20:04:41 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-29 00:27:18 +0200
commit2b904294a87b303d4f1df03f92dd2c259ff53f00 (patch)
tree2a4acef7efcabe7d0d03eb978b61b1672880c8ad /src/printsupport/dialogs
parent92283176ac3ab537b589dd6530fc7849adf5cae4 (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/printsupport/dialogs')
-rw-r--r--src/printsupport/dialogs/qabstractpagesetupdialog.h1
-rw-r--r--src/printsupport/dialogs/qabstractprintdialog.h1
-rw-r--r--src/printsupport/dialogs/qprintpreviewdialog.h1
3 files changed, 3 insertions, 0 deletions
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 <QtWidgets/qdialog.h>
+#include <QtPrintSupport/qtprintsupportglobal.h>
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 <QtWidgets/qdialog.h>
+#include <QtPrintSupport/qtprintsupportglobal.h>
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 <QtWidgets/qdialog.h>
+#include <QtPrintSupport/qtprintsupportglobal.h>
#ifndef QT_NO_PRINTPREVIEWDIALOG