diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-11 17:36:31 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-18 14:52:21 +0000 |
| commit | 5867e0a7ab125004bfae74d668c2ab97786c107c (patch) | |
| tree | 1969a83974e5df322bdbe6f41a0a258e979fecb8 /src/plugins/printsupport | |
| parent | c0eafb9d75b6e24c03cde848b6482d0fcad9ee31 (diff) | |
| download | qtbase-5867e0a7ab125004bfae74d668c2ab97786c107c.tar.gz | |
Don't build CUPS related code if QT_NO_CUPS is set.
Various related classes aren't built in this case, so the build fails
if we try to build the plugin or the widget.
Change-Id: Ia3f8651f172bc3c4c643fb2521601683b403eadc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Diffstat (limited to 'src/plugins/printsupport')
7 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/printsupport/cups/main.cpp b/src/plugins/printsupport/cups/main.cpp index 82485114ab..64b2e80657 100644 --- a/src/plugins/printsupport/cups/main.cpp +++ b/src/plugins/printsupport/cups/main.cpp @@ -37,7 +37,7 @@ #include <qpa/qplatformprintplugin.h> #include <QtCore/QStringList> -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) QT_BEGIN_NAMESPACE @@ -65,6 +65,6 @@ QPlatformPrinterSupport *QCupsPrinterSupportPlugin::create(const QString &key) QT_END_NAMESPACE -#endif // QT_NO_PRINTER +#endif // !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) #include "main.moc" diff --git a/src/plugins/printsupport/cups/qcupsprintengine.cpp b/src/plugins/printsupport/cups/qcupsprintengine.cpp index c00d7f302c..9fa164e8cc 100644 --- a/src/plugins/printsupport/cups/qcupsprintengine.cpp +++ b/src/plugins/printsupport/cups/qcupsprintengine.cpp @@ -33,7 +33,7 @@ #include "qcupsprintengine_p.h" -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) #include <qpa/qplatformprintplugin.h> #include <qpa/qplatformprintersupport.h> @@ -316,4 +316,4 @@ void QCupsPrintEnginePrivate::setPageSize(const QPageSize &pageSize) QT_END_NAMESPACE -#endif // QT_NO_PRINTER +#endif // !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) diff --git a/src/plugins/printsupport/cups/qcupsprintengine_p.h b/src/plugins/printsupport/cups/qcupsprintengine_p.h index b589d40b6c..1396baf106 100644 --- a/src/plugins/printsupport/cups/qcupsprintengine_p.h +++ b/src/plugins/printsupport/cups/qcupsprintengine_p.h @@ -47,7 +47,7 @@ #include "QtPrintSupport/qprintengine.h" -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) #include <QtCore/qstring.h> #include <QtGui/qpaintengine.h> @@ -100,6 +100,6 @@ private: QT_END_NAMESPACE -#endif // QT_NO_PRINTER +#endif // !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) #endif // QCUPSPRINTENGINE_P_H diff --git a/src/plugins/printsupport/cups/qcupsprintersupport.cpp b/src/plugins/printsupport/cups/qcupsprintersupport.cpp index ea7c116e3c..efa025c3b1 100644 --- a/src/plugins/printsupport/cups/qcupsprintersupport.cpp +++ b/src/plugins/printsupport/cups/qcupsprintersupport.cpp @@ -34,7 +34,7 @@ #include "qcupsprintersupport_p.h" -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) #include "qcupsprintengine_p.h" #include "qppdprintdevice.h" @@ -110,4 +110,4 @@ QString QCupsPrinterSupport::defaultPrintDeviceId() const QT_END_NAMESPACE -#endif // QT_NO_PRINTER +#endif // !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) diff --git a/src/plugins/printsupport/cups/qcupsprintersupport_p.h b/src/plugins/printsupport/cups/qcupsprintersupport_p.h index ea913deeaa..170daa9d3b 100644 --- a/src/plugins/printsupport/cups/qcupsprintersupport_p.h +++ b/src/plugins/printsupport/cups/qcupsprintersupport_p.h @@ -48,7 +48,7 @@ #include <qpa/qplatformprintersupport.h> -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) #include <QtCore/qstringlist.h> @@ -73,5 +73,5 @@ private: QT_END_NAMESPACE -#endif // QT_NO_PRINTER +#endif // !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) #endif // QCUPSPRINTERSUPPORT_H diff --git a/src/plugins/printsupport/cups/qppdprintdevice.cpp b/src/plugins/printsupport/cups/qppdprintdevice.cpp index 808424b1ed..477d7ff82c 100644 --- a/src/plugins/printsupport/cups/qppdprintdevice.cpp +++ b/src/plugins/printsupport/cups/qppdprintdevice.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) QPpdPrintDevice::QPpdPrintDevice() : QPlatformPrintDevice(), @@ -472,6 +472,6 @@ cups_ptype_e QPpdPrintDevice::printerTypeFlags() const return static_cast<cups_ptype_e>(printerOption("printer-type").toUInt()); } -#endif // QT_NO_PRINTER +#endif // !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) QT_END_NAMESPACE diff --git a/src/plugins/printsupport/cups/qppdprintdevice.h b/src/plugins/printsupport/cups/qppdprintdevice.h index 64eb872bd1..04c3e65317 100644 --- a/src/plugins/printsupport/cups/qppdprintdevice.h +++ b/src/plugins/printsupport/cups/qppdprintdevice.h @@ -47,7 +47,7 @@ #include <qpa/qplatformprintdevice.h> -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) #include <QtCore/qbytearray.h> #include <QtCore/qhash.h> @@ -111,5 +111,5 @@ private: QT_END_NAMESPACE -#endif // QT_NO_PRINTER +#endif // !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) #endif // QPPDPRINTDEVICE_H |