From 68e31e4ab9fb3fdd544bc402e7654e2ac1f5eb53 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Fri, 19 Jun 2015 13:27:53 +0200
Subject: 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>
---
 src/plugins/printsupport/cocoa/main.cpp                  | 4 ----
 src/plugins/printsupport/cups/main.cpp                   | 4 ----
 src/plugins/printsupport/cups/qcupsprintengine.cpp       | 4 ----
 src/plugins/printsupport/cups/qcupsprintengine_p.h       | 4 ----
 src/plugins/printsupport/cups/qcupsprintersupport.cpp    | 4 ----
 src/plugins/printsupport/cups/qcupsprintersupport_p.h    | 3 ---
 src/plugins/printsupport/cups/qppdprintdevice.cpp        | 4 ----
 src/plugins/printsupport/cups/qppdprintdevice.h          | 3 ---
 src/plugins/printsupport/printsupport.pro                | 5 ++++-
 src/plugins/printsupport/windows/qwindowsprintdevice.cpp | 4 ----
 src/plugins/printsupport/windows/qwindowsprintdevice.h   | 3 ---
 11 files changed, 4 insertions(+), 38 deletions(-)

(limited to 'src/plugins/printsupport')

diff --git a/src/plugins/printsupport/cocoa/main.cpp b/src/plugins/printsupport/cocoa/main.cpp
index 2037724719..3db7b49ba4 100644
--- a/src/plugins/printsupport/cocoa/main.cpp
+++ b/src/plugins/printsupport/cocoa/main.cpp
@@ -38,8 +38,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_PRINTER
-
 class QCocoaPrinterSupportPlugin : public QPlatformPrinterSupportPlugin
 {
     Q_OBJECT
@@ -67,8 +65,6 @@ QPlatformPrinterSupport *QCocoaPrinterSupportPlugin::create(const QString &key)
     return platformPrinterSupport;
 }
 
-#endif
-
 QT_END_NAMESPACE
 
 #include "main.moc"
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
diff --git a/src/plugins/printsupport/printsupport.pro b/src/plugins/printsupport/printsupport.pro
index ed201f0744..bd6681f53c 100644
--- a/src/plugins/printsupport/printsupport.pro
+++ b/src/plugins/printsupport/printsupport.pro
@@ -2,4 +2,7 @@ TEMPLATE = subdirs
 
 osx:   SUBDIRS += cocoa
 win32: SUBDIRS += windows
-unix:!mac:contains(QT_CONFIG, cups): SUBDIRS += cups
+unix:!mac:contains(QT_CONFIG, cups) {
+    load(qfeatures)
+    !contains(QT_DISABLED_FEATURES, cups): SUBDIRS += cups
+}
diff --git a/src/plugins/printsupport/windows/qwindowsprintdevice.cpp b/src/plugins/printsupport/windows/qwindowsprintdevice.cpp
index 505f3138ca..d378ff3130 100644
--- a/src/plugins/printsupport/windows/qwindowsprintdevice.cpp
+++ b/src/plugins/printsupport/windows/qwindowsprintdevice.cpp
@@ -41,8 +41,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_PRINTER
-
 QT_WARNING_DISABLE_GCC("-Wsign-compare")
 
 extern qreal qt_pointMultiplier(QPageLayout::Unit unit);
@@ -471,6 +469,4 @@ 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 8ab487a59c..2c232d22c5 100644
--- a/src/plugins/printsupport/windows/qwindowsprintdevice.h
+++ b/src/plugins/printsupport/windows/qwindowsprintdevice.h
@@ -47,8 +47,6 @@
 
 #include <qpa/qplatformprintdevice.h>
 
-#ifndef QT_NO_PRINTER
-
 #include <QtCore/qt_windows.h>
 
 QT_BEGIN_NAMESPACE
@@ -95,5 +93,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_PRINTER
 #endif // QWINDOWSPRINTDEVICE_H
-- 
cgit v1.2.3