diff options
author | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-29 16:56:28 +0200 |
---|---|---|
committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-30 17:21:07 +0000 |
commit | 18e5d10426e7b116f02b20c258542c4de4f18560 (patch) | |
tree | 5bda0c97f8778df83ccb1c6ac86d79498399faa1 /src/printsupport/kernel | |
parent | 86326149474763a9b7adf109b59c7c4acc74b031 (diff) |
Convert features.cups to QT_[REQUIRE_]CONFIG
Change-Id: I189134b41c4f6e4ac42b5e47ae79338c744b581d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/printsupport/kernel')
-rw-r--r-- | src/printsupport/kernel/qcups.cpp | 4 | ||||
-rw-r--r-- | src/printsupport/kernel/qcups_p.h | 4 | ||||
-rw-r--r-- | src/printsupport/kernel/qprint_p.h | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/printsupport/kernel/qcups.cpp b/src/printsupport/kernel/qcups.cpp index d655dd09ba..48ab71eea4 100644 --- a/src/printsupport/kernel/qcups.cpp +++ b/src/printsupport/kernel/qcups.cpp @@ -41,8 +41,6 @@ #include "qprintengine.h" -#ifndef QT_NO_CUPS - QT_BEGIN_NAMESPACE QStringList QCUPSSupport::cupsOptionsList(QPrinter *printer) @@ -205,5 +203,3 @@ void QCUPSSupport::setPageRange(QPrinter *printer, int pageFrom, int pageTo) } QT_END_NAMESPACE - -#endif // QT_NO_CUPS diff --git a/src/printsupport/kernel/qcups_p.h b/src/printsupport/kernel/qcups_p.h index 139b18c509..780115e350 100644 --- a/src/printsupport/kernel/qcups_p.h +++ b/src/printsupport/kernel/qcups_p.h @@ -57,7 +57,7 @@ #include "QtPrintSupport/qprinter.h" #include "QtCore/qdatetime.h" -#ifndef QT_NO_CUPS +QT_REQUIRE_CONFIG(cups); QT_BEGIN_NAMESPACE @@ -150,6 +150,4 @@ Q_DECLARE_METATYPE(QCUPSSupport::PageSet) Q_DECLARE_METATYPE(QCUPSSupport::PagesPerSheetLayout) Q_DECLARE_METATYPE(QCUPSSupport::PagesPerSheet) -#endif // QT_NO_CUPS - #endif diff --git a/src/printsupport/kernel/qprint_p.h b/src/printsupport/kernel/qprint_p.h index 47dfce3787..280c2d7608 100644 --- a/src/printsupport/kernel/qprint_p.h +++ b/src/printsupport/kernel/qprint_p.h @@ -57,7 +57,7 @@ #include <QtCore/qstring.h> #include <QtCore/qlist.h> -#if (defined Q_OS_OSX) || (defined Q_OS_UNIX && !defined QT_NO_CUPS) +#if (defined Q_OS_MACOS) || (defined Q_OS_UNIX && QT_CONFIG(cups)) #include <cups/ppd.h> // Use for type defs only, don't want to actually link in main module #endif @@ -245,7 +245,7 @@ public: return QByteArray(); } -#if (defined Q_OS_OSX) || (defined Q_OS_UNIX && !defined QT_NO_CUPS) +#if (defined Q_OS_MACOS) || (defined Q_OS_UNIX && QT_CONFIG(cups)) // PPD utilities shared by CUPS and Mac plugins requiring CUPS headers // May turn into a proper internal QPpd class if enough shared between Mac and CUPS, |