QtPrinterSupport: Fix compilation with QT_NO_PRINTER
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 4 Oct 2012 09:58:22 +0000 (11:58 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 9 Oct 2012 09:23:10 +0000 (11:23 +0200)
This seems to be a left over of 80f7a388906f94f58bf765a32b9abbb16f967db2

Task-number: QTBUG-27177
Change-Id: I72a285ed1d64f756d585a86d8401ee23eb4a1ce1
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Indrajit Tapadar <indrajit.tapadar@digia.com>
Reviewed-by: Holger Ihrig <holger.ihrig@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
src/plugins/printsupport/cups/main.cpp
src/plugins/printsupport/cups/qcupsprintersupport.cpp
src/plugins/printsupport/cups/qcupsprintersupport_p.h

index 47951ae..94923d2 100644 (file)
@@ -45,6 +45,8 @@
 #include <qpa/qplatformprintplugin.h>
 #include <QtCore/QStringList>
 
+#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"
index 23f3d91..89318a6 100644 (file)
@@ -41,6 +41,8 @@
 
 #include "qcupsprintersupport_p.h"
 
+#ifndef QT_NO_PRINTER
+
 #include "qcupsprintengine_p.h"
 #include <private/qprinterinfo_p.h>
 
@@ -144,3 +146,5 @@ PrinterOptions QCupsPrinterSupport::printerOptions(const QPrinterInfo &printer)
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_PRINTER
index e534768..1321e83 100644 (file)
@@ -42,6 +42,8 @@
 #ifndef QCUPSPRINTERSUPPORT_H
 #define QCUPSPRINTERSUPPORT_H
 
+#ifndef QT_NO_PRINTER
+
 #include <qpa/qplatformprintersupport.h>
 
 #include <QtCore/qlibrary.h>
@@ -85,4 +87,5 @@ private:
 QT_END_NAMESPACE
 QT_END_HEADER
 
+#endif // QT_NO_PRINTER
 #endif // QCUPSPRINTERSUPPORT_H