diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-19 13:27:53 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-22 14:21:25 +0000 |
commit | 68e31e4ab9fb3fdd544bc402e7654e2ac1f5eb53 (patch) | |
tree | e7dd3f9afd802d1a1ce53930910c317744966f61 /src/plugins/printsupport/cups | |
parent | b93d1f6b1f90f9c24ba31b8c7c1b8d01327c05b9 (diff) |
Replace #ifdefs with qmake feature checks.
This prevents the building of dysfunctional plugins that don't define
a loader function, or won't compile at all.
Change-Id: Ib62edb8db4a8917effa05292cb702bb4022f552c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/plugins/printsupport/cups')
7 files changed, 0 insertions, 26 deletions
diff --git a/src/plugins/printsupport/cups/main.cpp b/src/plugins/printsupport/cups/main.cpp index 64b2e80657..abd24d411a 100644 --- a/src/plugins/printsupport/cups/main.cpp +++ b/src/plugins/printsupport/cups/main.cpp @@ -37,8 +37,6 @@ #include <qpa/qplatformprintplugin.h> #include <QtCore/QStringList> -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) - QT_BEGIN_NAMESPACE class QCupsPrinterSupportPlugin : public QPlatformPrinterSupportPlugin @@ -65,6 +63,4 @@ QPlatformPrinterSupport *QCupsPrinterSupportPlugin::create(const QString &key) QT_END_NAMESPACE -#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 9fa164e8cc..b0c78c66f3 100644 --- a/src/plugins/printsupport/cups/qcupsprintengine.cpp +++ b/src/plugins/printsupport/cups/qcupsprintengine.cpp @@ -33,8 +33,6 @@ #include "qcupsprintengine_p.h" -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) - #include <qpa/qplatformprintplugin.h> #include <qpa/qplatformprintersupport.h> @@ -315,5 +313,3 @@ void QCupsPrintEnginePrivate::setPageSize(const QPageSize &pageSize) } QT_END_NAMESPACE - -#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 1396baf106..a611740e09 100644 --- a/src/plugins/printsupport/cups/qcupsprintengine_p.h +++ b/src/plugins/printsupport/cups/qcupsprintengine_p.h @@ -47,8 +47,6 @@ #include "QtPrintSupport/qprintengine.h" -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) - #include <QtCore/qstring.h> #include <QtGui/qpaintengine.h> @@ -100,6 +98,4 @@ private: QT_END_NAMESPACE -#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 efa025c3b1..da8f369787 100644 --- a/src/plugins/printsupport/cups/qcupsprintersupport.cpp +++ b/src/plugins/printsupport/cups/qcupsprintersupport.cpp @@ -34,8 +34,6 @@ #include "qcupsprintersupport_p.h" -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) - #include "qcupsprintengine_p.h" #include "qppdprintdevice.h" #include <private/qprinterinfo_p.h> @@ -109,5 +107,3 @@ QString QCupsPrinterSupport::defaultPrintDeviceId() const } QT_END_NAMESPACE - -#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 170daa9d3b..6dcaa4e893 100644 --- a/src/plugins/printsupport/cups/qcupsprintersupport_p.h +++ b/src/plugins/printsupport/cups/qcupsprintersupport_p.h @@ -48,8 +48,6 @@ #include <qpa/qplatformprintersupport.h> -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) - #include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE @@ -73,5 +71,4 @@ private: QT_END_NAMESPACE -#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 477d7ff82c..2ed8215e41 100644 --- a/src/plugins/printsupport/cups/qppdprintdevice.cpp +++ b/src/plugins/printsupport/cups/qppdprintdevice.cpp @@ -42,8 +42,6 @@ QT_BEGIN_NAMESPACE -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) - QPpdPrintDevice::QPpdPrintDevice() : QPlatformPrintDevice(), m_cupsDest(0), @@ -472,6 +470,4 @@ cups_ptype_e QPpdPrintDevice::printerTypeFlags() const return static_cast<cups_ptype_e>(printerOption("printer-type").toUInt()); } -#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 04c3e65317..a28348eb60 100644 --- a/src/plugins/printsupport/cups/qppdprintdevice.h +++ b/src/plugins/printsupport/cups/qppdprintdevice.h @@ -47,8 +47,6 @@ #include <qpa/qplatformprintdevice.h> -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) - #include <QtCore/qbytearray.h> #include <QtCore/qhash.h> #include <QtCore/qmargins.h> @@ -111,5 +109,4 @@ private: QT_END_NAMESPACE -#endif // !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) #endif // QPPDPRINTDEVICE_H |