diff options
| author | John Layt <jlayt@kde.org> | 2014-03-13 20:24:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-17 13:46:26 +0100 |
| commit | 833a43d56c644b2201643b1e7593b0ee86d0d258 (patch) | |
| tree | 9b41ec276f7a3a1fb6352c493e774597276a8321 /src/printsupport/kernel | |
| parent | 69e9b12001be08fe2b3f2c2def0ca3468d83b675 (diff) | |
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>
Diffstat (limited to 'src/printsupport/kernel')
| -rw-r--r-- | src/printsupport/kernel/qplatformprintdevice.cpp | 4 | ||||
| -rw-r--r-- | src/printsupport/kernel/qplatformprintdevice.h | 6 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprintdevice.cpp | 4 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprintdevice_p.h | 4 |
4 files changed, 16 insertions, 2 deletions
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 |