From 3374f06af2085c372da7fb634b2f82d7440dcdd1 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 4 Oct 2012 11:58:22 +0200 Subject: [PATCH] QtPrinterSupport: Fix compilation with QT_NO_PRINTER MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This seems to be a left over of 80f7a388906f94f58bf765a32b9abbb16f967db2 Task-number: QTBUG-27177 Change-Id: I72a285ed1d64f756d585a86d8401ee23eb4a1ce1 Reviewed-by: Sérgio Martins Reviewed-by: Indrajit Tapadar Reviewed-by: Holger Ihrig Reviewed-by: Sergio Ahumada --- src/plugins/printsupport/cups/main.cpp | 4 ++++ src/plugins/printsupport/cups/qcupsprintersupport.cpp | 4 ++++ src/plugins/printsupport/cups/qcupsprintersupport_p.h | 3 +++ 3 files changed, 11 insertions(+) diff --git a/src/plugins/printsupport/cups/main.cpp b/src/plugins/printsupport/cups/main.cpp index 47951ae..94923d2 100644 --- a/src/plugins/printsupport/cups/main.cpp +++ b/src/plugins/printsupport/cups/main.cpp @@ -45,6 +45,8 @@ #include #include +#ifndef QT_NO_PRINTER + QT_BEGIN_NAMESPACE class QCupsPrinterSupportPlugin : public QPlatformPrinterSupportPlugin @@ -71,4 +73,6 @@ QPlatformPrinterSupport *QCupsPrinterSupportPlugin::create(const QString &key) QT_END_NAMESPACE +#endif // QT_NO_PRINTER + #include "main.moc" diff --git a/src/plugins/printsupport/cups/qcupsprintersupport.cpp b/src/plugins/printsupport/cups/qcupsprintersupport.cpp index 23f3d91..89318a6 100644 --- a/src/plugins/printsupport/cups/qcupsprintersupport.cpp +++ b/src/plugins/printsupport/cups/qcupsprintersupport.cpp @@ -41,6 +41,8 @@ #include "qcupsprintersupport_p.h" +#ifndef QT_NO_PRINTER + #include "qcupsprintengine_p.h" #include @@ -144,3 +146,5 @@ PrinterOptions QCupsPrinterSupport::printerOptions(const QPrinterInfo &printer) } QT_END_NAMESPACE + +#endif // QT_NO_PRINTER diff --git a/src/plugins/printsupport/cups/qcupsprintersupport_p.h b/src/plugins/printsupport/cups/qcupsprintersupport_p.h index e534768..1321e83 100644 --- a/src/plugins/printsupport/cups/qcupsprintersupport_p.h +++ b/src/plugins/printsupport/cups/qcupsprintersupport_p.h @@ -42,6 +42,8 @@ #ifndef QCUPSPRINTERSUPPORT_H #define QCUPSPRINTERSUPPORT_H +#ifndef QT_NO_PRINTER + #include #include @@ -85,4 +87,5 @@ private: QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_PRINTER #endif // QCUPSPRINTERSUPPORT_H -- 2.7.4