From 18e5d10426e7b116f02b20c258542c4de4f18560 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Mon, 29 May 2017 16:56:28 +0200 Subject: Convert features.cups to QT_[REQUIRE_]CONFIG Change-Id: I189134b41c4f6e4ac42b5e47ae79338c744b581d Reviewed-by: Oswald Buddenhagen --- src/printsupport/widgets/qcupsjobwidget.cpp | 4 ---- src/printsupport/widgets/widgets.pri | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/printsupport/widgets') diff --git a/src/printsupport/widgets/qcupsjobwidget.cpp b/src/printsupport/widgets/qcupsjobwidget.cpp index 204a125d13..00f2d64df2 100644 --- a/src/printsupport/widgets/qcupsjobwidget.cpp +++ b/src/printsupport/widgets/qcupsjobwidget.cpp @@ -54,8 +54,6 @@ QT_BEGIN_NAMESPACE -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) - /*! \internal \class QCupsJobWidget @@ -212,6 +210,4 @@ QCUPSSupport::BannerPage QCupsJobWidget::endBannerPage() const return m_ui.endBannerPageCombo->itemData(m_ui.endBannerPageCombo->currentIndex()).value(); } -#endif // QT_NO_PRINTER / QT_NO_CUPS - QT_END_NAMESPACE diff --git a/src/printsupport/widgets/widgets.pri b/src/printsupport/widgets/widgets.pri index 505983778e..1fa32764e8 100644 --- a/src/printsupport/widgets/widgets.pri +++ b/src/printsupport/widgets/widgets.pri @@ -1,7 +1,7 @@ HEADERS += widgets/qprintpreviewwidget.h SOURCES += widgets/qprintpreviewwidget.cpp -unix:!darwin:qtConfig(cups):qtConfig(cupsjobwidget) { +unix:!darwin:qtConfig(cupsjobwidget) { HEADERS += widgets/qcupsjobwidget_p.h SOURCES += widgets/qcupsjobwidget.cpp FORMS += widgets/qcupsjobwidget.ui -- cgit v1.2.3