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/plugins/printsupport/windows | |
| 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/plugins/printsupport/windows')
| -rw-r--r-- | src/plugins/printsupport/windows/qwindowsprintdevice.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/printsupport/windows/qwindowsprintdevice.h | 5 |
2 files changed, 6 insertions, 3 deletions
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 |