From 2e95ce7459c98f17f5b8d0c983bfb32102fd9932 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 19 Aug 2011 10:39:45 +0200
Subject: Fix build.

- Introduced EXPORT definition for new QPrintSupport library.
- Fixed dependencies in src.pro
- Fixed some includes.

Change-Id: I9863233ca2767928b37cf3fd1fdec31351b5da6b
Reviewed-on: http://codereview.qt.nokia.com/3253
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/printsupport/dialogs/qabstractpagesetupdialog.h   | 2 +-
 src/printsupport/dialogs/qabstractprintdialog.h       | 2 +-
 src/printsupport/dialogs/qpagesetupdialog.h           | 2 +-
 src/printsupport/dialogs/qprintdialog.h               | 4 ++--
 src/printsupport/dialogs/qprintpreviewdialog.h        | 2 +-
 src/printsupport/kernel/qcups_p.h                     | 2 +-
 src/printsupport/kernel/qplatformprintersupport_qpa.h | 2 +-
 src/printsupport/kernel/qplatformprintplugin_qpa.h    | 2 +-
 src/printsupport/kernel/qprintengine.h                | 2 +-
 src/printsupport/kernel/qprintengine_pdf.cpp          | 4 ++++
 src/printsupport/kernel/qprintengine_pdf_p.h          | 4 ++--
 src/printsupport/kernel/qprinter.cpp                  | 4 ++--
 src/printsupport/kernel/qprinter.h                    | 2 +-
 src/printsupport/kernel/qprinter_p.h                  | 2 +-
 src/printsupport/kernel/qprinterinfo.h                | 2 +-
 src/printsupport/kernel/qprinterinfo_unix.cpp         | 2 +-
 src/printsupport/widgets/qprintpreviewwidget.h        | 2 +-
 17 files changed, 23 insertions(+), 19 deletions(-)

(limited to 'src/printsupport')

diff --git a/src/printsupport/dialogs/qabstractpagesetupdialog.h b/src/printsupport/dialogs/qabstractpagesetupdialog.h
index a867a8155b..597a7258d9 100644
--- a/src/printsupport/dialogs/qabstractpagesetupdialog.h
+++ b/src/printsupport/dialogs/qabstractpagesetupdialog.h
@@ -56,7 +56,7 @@ class QAbstractPageSetupDialogPrivate;
 class QPrinter;
 
 // ### Qt 5: Remove this class
-class Q_WIDGETS_EXPORT QAbstractPageSetupDialog : public QDialog
+class Q_PRINTSUPPORT_EXPORT QAbstractPageSetupDialog : public QDialog
 {
     Q_DECLARE_PRIVATE(QAbstractPageSetupDialog)
     Q_OBJECT
diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h
index 29c05d544b..2f8a750827 100644
--- a/src/printsupport/dialogs/qabstractprintdialog.h
+++ b/src/printsupport/dialogs/qabstractprintdialog.h
@@ -56,7 +56,7 @@ class QAbstractPrintDialogPrivate;
 class QPrinter;
 
 // ### Qt 5: remove this class
-class Q_WIDGETS_EXPORT QAbstractPrintDialog : public QDialog
+class Q_PRINTSUPPORT_EXPORT QAbstractPrintDialog : public QDialog
 {
     Q_DECLARE_PRIVATE(QAbstractPrintDialog)
     Q_OBJECT
diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h
index 3e983d3d95..1581ce6c41 100644
--- a/src/printsupport/dialogs/qpagesetupdialog.h
+++ b/src/printsupport/dialogs/qpagesetupdialog.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 
 class QPageSetupDialogPrivate;
 
-class Q_WIDGETS_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog
+class Q_PRINTSUPPORT_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPageSetupDialog)
diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h
index bb53ae6fd8..1b04263261 100644
--- a/src/printsupport/dialogs/qprintdialog.h
+++ b/src/printsupport/dialogs/qprintdialog.h
@@ -59,7 +59,7 @@ class QPrinter;
 #if defined (Q_OS_UNIX) && !defined(QTOPIA_PRINTDIALOG) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN)
 class QUnixPrintWidgetPrivate;
 
-class Q_WIDGETS_EXPORT QUnixPrintWidget : public QWidget
+class Q_PRINTSUPPORT_EXPORT QUnixPrintWidget : public QWidget
 {
     Q_OBJECT
 
@@ -78,7 +78,7 @@ private:
 };
 #endif
 
-class Q_WIDGETS_EXPORT QPrintDialog : public QAbstractPrintDialog
+class Q_PRINTSUPPORT_EXPORT QPrintDialog : public QAbstractPrintDialog
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPrintDialog)
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h
index fa67f02b93..f2997b09f5 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.h
+++ b/src/printsupport/dialogs/qprintpreviewdialog.h
@@ -56,7 +56,7 @@ class QGraphicsView;
 class QPrintPreviewDialogPrivate;
 class QPrinter;
 
-class Q_WIDGETS_EXPORT QPrintPreviewDialog : public QDialog
+class Q_PRINTSUPPORT_EXPORT QPrintPreviewDialog : public QDialog
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPrintPreviewDialog)
diff --git a/src/printsupport/kernel/qcups_p.h b/src/printsupport/kernel/qcups_p.h
index 33a4e264d7..cb7a79e486 100644
--- a/src/printsupport/kernel/qcups_p.h
+++ b/src/printsupport/kernel/qcups_p.h
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
 
 Q_DECLARE_TYPEINFO(cups_option_t, Q_MOVABLE_TYPE | Q_PRIMITIVE_TYPE);
 
-class Q_GUI_EXPORT QCUPSSupport
+class Q_PRINTSUPPORT_EXPORT QCUPSSupport
 {
 public:
     struct Printer
diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.h b/src/printsupport/kernel/qplatformprintersupport_qpa.h
index 3fe4ff04ee..800713c5bb 100644
--- a/src/printsupport/kernel/qplatformprintersupport_qpa.h
+++ b/src/printsupport/kernel/qplatformprintersupport_qpa.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 
 class QPrintEngine;
 
-class Q_GUI_EXPORT QPlatformPrinterSupport
+class Q_PRINTSUPPORT_EXPORT QPlatformPrinterSupport
 {
 public:
     QPlatformPrinterSupport();
diff --git a/src/printsupport/kernel/qplatformprintplugin_qpa.h b/src/printsupport/kernel/qplatformprintplugin_qpa.h
index 7c7e32994e..831a0546b0 100644
--- a/src/printsupport/kernel/qplatformprintplugin_qpa.h
+++ b/src/printsupport/kernel/qplatformprintplugin_qpa.h
@@ -73,7 +73,7 @@ struct QPlatformPrinterSupportFactoryInterface : public QFactoryInterface
 
 Q_DECLARE_INTERFACE(QPlatformPrinterSupportFactoryInterface, QPlatformPrinterSupportFactoryInterface_iid)
 
-class Q_GUI_EXPORT QPlatformPrinterSupportPlugin : public QObject, public QPlatformPrinterSupportFactoryInterface
+class Q_PRINTSUPPORT_EXPORT QPlatformPrinterSupportPlugin : public QObject, public QPlatformPrinterSupportFactoryInterface
 {
     Q_OBJECT
     Q_INTERFACES(QPlatformPrinterSupportFactoryInterface:QFactoryInterface)
diff --git a/src/printsupport/kernel/qprintengine.h b/src/printsupport/kernel/qprintengine.h
index 550079defc..782b6ef8bd 100644
--- a/src/printsupport/kernel/qprintengine.h
+++ b/src/printsupport/kernel/qprintengine.h
@@ -53,7 +53,7 @@ QT_MODULE(Gui)
 
 #ifndef QT_NO_PRINTER
 
-class Q_GUI_EXPORT QPrintEngine
+class Q_PRINTSUPPORT_EXPORT QPrintEngine
 {
 public:
     virtual ~QPrintEngine() {}
diff --git a/src/printsupport/kernel/qprintengine_pdf.cpp b/src/printsupport/kernel/qprintengine_pdf.cpp
index eb1bf163d3..c8ce2cfa0f 100644
--- a/src/printsupport/kernel/qprintengine_pdf.cpp
+++ b/src/printsupport/kernel/qprintengine_pdf.cpp
@@ -58,6 +58,10 @@
 #include "private/qcore_unix_p.h" // overrides QT_OPEN
 #endif
 
+#ifdef Q_OS_WIN
+#include <io.h> // _close.
+#endif
+
 QT_BEGIN_NAMESPACE
 
 //#define FONT_DUMP
diff --git a/src/printsupport/kernel/qprintengine_pdf_p.h b/src/printsupport/kernel/qprintengine_pdf_p.h
index e27adda7b3..483cde9af9 100644
--- a/src/printsupport/kernel/qprintengine_pdf_p.h
+++ b/src/printsupport/kernel/qprintengine_pdf_p.h
@@ -89,8 +89,8 @@ namespace QPdf {
     struct PaperSize {
         int width, height; // in postscript points
     };
-    Q_GUI_EXPORT PaperSize paperSize(QPrinter::PaperSize paperSize);
-    Q_GUI_EXPORT const char *paperSizeToString(QPrinter::PaperSize paperSize);
+    Q_PRINTSUPPORT_EXPORT PaperSize paperSize(QPrinter::PaperSize paperSize);
+    Q_PRINTSUPPORT_EXPORT const char *paperSizeToString(QPrinter::PaperSize paperSize);
 }
 
 class QPdfPrintEnginePrivate;
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index a0740976f4..ae215945d3 100644
--- a/src/printsupport/kernel/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -118,7 +118,7 @@ static const float qt_paperSizes[][2] = {
 };
 
 /// return the multiplier of converting from the unit value to postscript-points.
-Q_GUI_EXPORT double qt_multiplierForUnit(QPrinter::Unit unit, int resolution)
+Q_PRINTSUPPORT_EXPORT double qt_multiplierForUnit(QPrinter::Unit unit, int resolution)
 {
     switch(unit) {
     case QPrinter::Millimeter:
@@ -140,7 +140,7 @@ Q_GUI_EXPORT double qt_multiplierForUnit(QPrinter::Unit unit, int resolution)
 }
 
 // not static: it's needed in qpagesetupdialog_unix.cpp
-Q_GUI_EXPORT QSizeF qt_printerPaperSize(QPrinter::Orientation orientation,
+Q_PRINTSUPPORT_EXPORT QSizeF qt_printerPaperSize(QPrinter::Orientation orientation,
                            QPrinter::PaperSize paperSize,
                            QPrinter::Unit unit,
                            int resolution)
diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h
index f3c6615692..7d04099a8f 100644
--- a/src/printsupport/kernel/qprinter.h
+++ b/src/printsupport/kernel/qprinter.h
@@ -63,7 +63,7 @@ class QPaintEngine;
 class QPrintEngine;
 class QPrinterInfo;
 
-class Q_GUI_EXPORT QPrinter : public QPagedPaintDevice
+class Q_PRINTSUPPORT_EXPORT QPrinter : public QPagedPaintDevice
 {
     Q_DECLARE_PRIVATE(QPrinter)
 public:
diff --git a/src/printsupport/kernel/qprinter_p.h b/src/printsupport/kernel/qprinter_p.h
index b339612d66..08877f08c5 100644
--- a/src/printsupport/kernel/qprinter_p.h
+++ b/src/printsupport/kernel/qprinter_p.h
@@ -70,7 +70,7 @@ class QPrintEngine;
 class QPreviewPaintEngine;
 class QPicture;
 
-class Q_GUI_EXPORT QPrinterPrivate
+class Q_PRINTSUPPORT_EXPORT QPrinterPrivate
 {
     Q_DECLARE_PUBLIC(QPrinter)
 public:
diff --git a/src/printsupport/kernel/qprinterinfo.h b/src/printsupport/kernel/qprinterinfo.h
index f00503f2c2..535c29c4d6 100644
--- a/src/printsupport/kernel/qprinterinfo.h
+++ b/src/printsupport/kernel/qprinterinfo.h
@@ -55,7 +55,7 @@ QT_MODULE(Gui)
 #ifndef QT_NO_PRINTER
 class QPrinterInfoPrivate;
 class QPrinterInfoPrivateDeleter;
-class Q_GUI_EXPORT QPrinterInfo
+class Q_PRINTSUPPORT_EXPORT QPrinterInfo
 {
 public:
     QPrinterInfo();
diff --git a/src/printsupport/kernel/qprinterinfo_unix.cpp b/src/printsupport/kernel/qprinterinfo_unix.cpp
index 3c66481b4d..c7dbb7cc32 100644
--- a/src/printsupport/kernel/qprinterinfo_unix.cpp
+++ b/src/printsupport/kernel/qprinterinfo_unix.cpp
@@ -741,7 +741,7 @@ void qt_parseQconfig(QList<QPrinterDescription> *printers)
     } while (!ts.atEnd());
 }
 
-Q_GUI_EXPORT int qt_getLprPrinters(QList<QPrinterDescription>& printers)
+Q_PRINTSUPPORT_EXPORT int qt_getLprPrinters(QList<QPrinterDescription>& printers)
 {
     QByteArray etcLpDefault;
     qt_parsePrintcap(&printers, QLatin1String("/etc/printcap"));
diff --git a/src/printsupport/widgets/qprintpreviewwidget.h b/src/printsupport/widgets/qprintpreviewwidget.h
index 6a90755813..1c12bc0945 100644
--- a/src/printsupport/widgets/qprintpreviewwidget.h
+++ b/src/printsupport/widgets/qprintpreviewwidget.h
@@ -55,7 +55,7 @@ QT_MODULE(Gui)
 
 class QPrintPreviewWidgetPrivate;
 
-class Q_WIDGETS_EXPORT QPrintPreviewWidget : public QWidget
+class Q_PRINTSUPPORT_EXPORT QPrintPreviewWidget : public QWidget
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPrintPreviewWidget)
-- 
cgit v1.2.3