From 833a43d56c644b2201643b1e7593b0ee86d0d258 Mon Sep 17 00:00:00 2001
From: John Layt <jlayt@kde.org>
Date: Thu, 13 Mar 2014 20:24:16 +0100
Subject: QtPrintSupport - Fix QT_NO_PRINTER build

Fix the QT_NO_PRINTER build for issues that have accumulated over last
few months, and in the new changes already approved.

Change-Id: I9aed21dee861837fd1a68a96692c873a4f5be293
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/plugins/platforms/cocoa/qcocoaprintdevice.h          | 5 ++---
 src/plugins/platforms/cocoa/qcocoaprintdevice.mm         | 4 ++++
 src/plugins/printsupport/cups/qcupsprintersupport_p.h    | 5 ++---
 src/plugins/printsupport/cups/qppdprintdevice.cpp        | 4 ++++
 src/plugins/printsupport/cups/qppdprintdevice.h          | 5 ++---
 src/plugins/printsupport/windows/qwindowsprintdevice.cpp | 4 ++++
 src/plugins/printsupport/windows/qwindowsprintdevice.h   | 5 ++---
 src/printsupport/dialogs/qprintdialog_mac.mm             | 4 ++--
 src/printsupport/kernel/qplatformprintdevice.cpp         | 4 ++++
 src/printsupport/kernel/qplatformprintdevice.h           | 6 ++++--
 src/printsupport/kernel/qprintdevice.cpp                 | 4 ++++
 src/printsupport/kernel/qprintdevice_p.h                 | 4 ++++
 src/printsupport/widgets/qcupsjobwidget.cpp              | 4 ++++
 src/printsupport/widgets/qcupsjobwidget_p.h              | 4 ++++
 14 files changed, 46 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/plugins/platforms/cocoa/qcocoaprintdevice.h b/src/plugins/platforms/cocoa/qcocoaprintdevice.h
index 3f1fa475d5..30a2155bc7 100644
--- a/src/plugins/platforms/cocoa/qcocoaprintdevice.h
+++ b/src/plugins/platforms/cocoa/qcocoaprintdevice.h
@@ -53,11 +53,10 @@
 // We mean it.
 //
 
-#include <QtCore/qfeatures.h> // Some feature dependencies might define QT_NO_PRINTER
-#ifndef QT_NO_PRINTER
-
 #include <qpa/qplatformprintdevice.h>
 
+#ifndef QT_NO_PRINTER
+
 #include "qt_mac_p.h"
 
 #include <cups/ppd.h>
diff --git a/src/plugins/platforms/cocoa/qcocoaprintdevice.mm b/src/plugins/platforms/cocoa/qcocoaprintdevice.mm
index d8b01ec07f..3061e84470 100644
--- a/src/plugins/platforms/cocoa/qcocoaprintdevice.mm
+++ b/src/plugins/platforms/cocoa/qcocoaprintdevice.mm
@@ -46,6 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_PRINTER
+
 static QPrint::DuplexMode macToDuplexMode(const PMDuplexMode &mode)
 {
     if (mode == kPMDuplexTumble)
@@ -495,4 +497,6 @@ PMPaper QCocoaPrintDevice::macPaper(const QPageSize &pageSize) const
     return paper;
 }
 
+#endif // QT_NO_PRINTER
+
 QT_END_NAMESPACE
diff --git a/src/plugins/printsupport/cups/qcupsprintersupport_p.h b/src/plugins/printsupport/cups/qcupsprintersupport_p.h
index 27741a52fe..1cba4e997b 100644
--- a/src/plugins/printsupport/cups/qcupsprintersupport_p.h
+++ b/src/plugins/printsupport/cups/qcupsprintersupport_p.h
@@ -43,11 +43,10 @@
 #ifndef QCUPSPRINTERSUPPORT_H
 #define QCUPSPRINTERSUPPORT_H
 
-#include <QtCore/qfeatures.h> // Some feature dependencies might define QT_NO_PRINTER
-#ifndef QT_NO_PRINTER
-
 #include <qpa/qplatformprintersupport.h>
 
+#ifndef QT_NO_PRINTER
+
 #include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/printsupport/cups/qppdprintdevice.cpp b/src/plugins/printsupport/cups/qppdprintdevice.cpp
index fb2d34ed26..56ae5600c4 100644
--- a/src/plugins/printsupport/cups/qppdprintdevice.cpp
+++ b/src/plugins/printsupport/cups/qppdprintdevice.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_PRINTER
+
 QPpdPrintDevice::QPpdPrintDevice()
     : QPlatformPrintDevice(),
       m_cupsDest(0),
@@ -496,4 +498,6 @@ cups_ptype_e QPpdPrintDevice::printerTypeFlags() const
     return static_cast<cups_ptype_e>(printerOption("printer-type").toUInt());
 }
 
+#endif // QT_NO_PRINTER
+
 QT_END_NAMESPACE
diff --git a/src/plugins/printsupport/cups/qppdprintdevice.h b/src/plugins/printsupport/cups/qppdprintdevice.h
index cdea40dd6d..982f46d71f 100644
--- a/src/plugins/printsupport/cups/qppdprintdevice.h
+++ b/src/plugins/printsupport/cups/qppdprintdevice.h
@@ -53,11 +53,10 @@
 // We mean it.
 //
 
-#include <QtCore/qfeatures.h> // Some feature dependencies might define QT_NO_PRINTER
-#ifndef QT_NO_PRINTER
-
 #include <qpa/qplatformprintdevice.h>
 
+#ifndef QT_NO_PRINTER
+
 #include <cups/cups.h>
 #include <cups/ppd.h>
 
diff --git a/src/plugins/printsupport/windows/qwindowsprintdevice.cpp b/src/plugins/printsupport/windows/qwindowsprintdevice.cpp
index c45e266aaa..fce4bbb42b 100644
--- a/src/plugins/printsupport/windows/qwindowsprintdevice.cpp
+++ b/src/plugins/printsupport/windows/qwindowsprintdevice.cpp
@@ -45,6 +45,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_PRINTER
+
 extern qreal qt_pointMultiplier(QPageLayout::Unit unit);
 
 static inline uint qwcsnlen(const wchar_t *str, uint maxlen)
@@ -469,4 +471,6 @@ QString QWindowsPrintDevice::defaultPrintDeviceId()
     return QString::fromWCharArray(name.data());
 }
 
+#endif // QT_NO_PRINTER
+
 QT_END_NAMESPACE
diff --git a/src/plugins/printsupport/windows/qwindowsprintdevice.h b/src/plugins/printsupport/windows/qwindowsprintdevice.h
index f619876dcb..2d11787305 100644
--- a/src/plugins/printsupport/windows/qwindowsprintdevice.h
+++ b/src/plugins/printsupport/windows/qwindowsprintdevice.h
@@ -53,11 +53,10 @@
 // We mean it.
 //
 
-#include <QtCore/qfeatures.h> // Some feature dependencies might define QT_NO_PRINTER
-#ifndef QT_NO_PRINTER
-
 #include <qpa/qplatformprintdevice.h>
 
+#ifndef QT_NO_PRINTER
+
 #include <QtCore/qt_windows.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/printsupport/dialogs/qprintdialog_mac.mm b/src/printsupport/dialogs/qprintdialog_mac.mm
index 7194aee22f..9ff7c4766a 100644
--- a/src/printsupport/dialogs/qprintdialog_mac.mm
+++ b/src/printsupport/dialogs/qprintdialog_mac.mm
@@ -53,10 +53,10 @@
 
 #ifndef QT_NO_PRINTDIALOG
 
-extern qreal qt_pointMultiplier(QPageLayout::Unit unit);
-
 QT_BEGIN_NAMESPACE
 
+extern qreal qt_pointMultiplier(QPageLayout::Unit unit);
+
 class QPrintDialogPrivate : public QAbstractPrintDialogPrivate
 {
     Q_DECLARE_PUBLIC(QPrintDialog)
diff --git a/src/printsupport/kernel/qplatformprintdevice.cpp b/src/printsupport/kernel/qplatformprintdevice.cpp
index df0ef3111b..4932bf1d04 100644
--- a/src/printsupport/kernel/qplatformprintdevice.cpp
+++ b/src/printsupport/kernel/qplatformprintdevice.cpp
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_PRINTER
+
 QPlatformPrintDevice::QPlatformPrintDevice()
     : m_isRemote(false),
       m_supportsMultipleCopies(false),
@@ -386,4 +388,6 @@ QPageSize QPlatformPrintDevice::createPageSize(int windowsId, const QSize &size,
     return QPageSize(windowsId, size, localizedName);
 }
 
+#endif // QT_NO_PRINTER
+
 QT_END_NAMESPACE
diff --git a/src/printsupport/kernel/qplatformprintdevice.h b/src/printsupport/kernel/qplatformprintdevice.h
index 04d614085f..7674c50c2f 100644
--- a/src/printsupport/kernel/qplatformprintdevice.h
+++ b/src/printsupport/kernel/qplatformprintdevice.h
@@ -53,8 +53,6 @@
 // We mean it.
 //
 
-#include "qplatformprintdevice.h"
-
 #include <private/qprint_p.h>
 
 #include <QtCore/qvector.h>
@@ -63,6 +61,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_PRINTER
+
 class Q_PRINTSUPPORT_EXPORT QPlatformPrintDevice : public QSharedData
 {
 public:
@@ -177,4 +177,6 @@ protected:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_PRINTER
+
 #endif // QPLATFORMPRINTDEVICE_H
diff --git a/src/printsupport/kernel/qprintdevice.cpp b/src/printsupport/kernel/qprintdevice.cpp
index c4ba12e0b0..eb0af455ee 100644
--- a/src/printsupport/kernel/qprintdevice.cpp
+++ b/src/printsupport/kernel/qprintdevice.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_PRINTER
+
 QPrintDevice::QPrintDevice()
     : d(new QPlatformPrintDevice())
 {
@@ -248,4 +250,6 @@ QList<QMimeType> QPrintDevice::supportedMimeTypes() const
     return isValid() ? d->supportedMimeTypes() : QList<QMimeType>();
 }
 
+#endif // QT_NO_PRINTER
+
 QT_END_NAMESPACE
diff --git a/src/printsupport/kernel/qprintdevice_p.h b/src/printsupport/kernel/qprintdevice_p.h
index 55124c16d4..4d63d46aeb 100644
--- a/src/printsupport/kernel/qprintdevice_p.h
+++ b/src/printsupport/kernel/qprintdevice_p.h
@@ -60,6 +60,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_PRINTER
+
 class QPlatformPrintDevice;
 class QMarginsF;
 class QMimeType;
@@ -142,4 +144,6 @@ Q_DECLARE_SHARED(QPrintDevice)
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_PRINTER
+
 #endif // QPLATFORMPRINTDEVICE_H
diff --git a/src/printsupport/widgets/qcupsjobwidget.cpp b/src/printsupport/widgets/qcupsjobwidget.cpp
index 9940e6a1af..7fd3e0105d 100644
--- a/src/printsupport/widgets/qcupsjobwidget.cpp
+++ b/src/printsupport/widgets/qcupsjobwidget.cpp
@@ -56,6 +56,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_PRINTER
+
 /*!
     \internal
     \class QCupsJobWidget
@@ -212,4 +214,6 @@ QCUPSSupport::BannerPage QCupsJobWidget::endBannerPage() const
     return m_ui.endBannerPageCombo->itemData(m_ui.endBannerPageCombo->currentIndex()).value<QCUPSSupport::BannerPage>();
 }
 
+#endif // QT_NO_PRINTER
+
 QT_END_NAMESPACE
diff --git a/src/printsupport/widgets/qcupsjobwidget_p.h b/src/printsupport/widgets/qcupsjobwidget_p.h
index a5e2bf8083..2a50a12b89 100644
--- a/src/printsupport/widgets/qcupsjobwidget_p.h
+++ b/src/printsupport/widgets/qcupsjobwidget_p.h
@@ -60,6 +60,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_PRINTER
+
 class QString;
 class QTime;
 class QPrinter;
@@ -106,6 +108,8 @@ private:
     Q_DISABLE_COPY(QCupsJobWidget)
 };
 
+#endif // QT_NO_PRINTER
+
 QT_END_NAMESPACE
 
 #endif  // QCUPSJOBWIDGET_P_H
-- 
cgit v1.2.3