From da1079e51c02505032d044e7b80bff2e4fc7a955 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@qt.io>
Date: Thu, 27 Apr 2017 12:09:06 +0900
Subject: Fix build without features.cupsjobwidget

Change-Id: I1b49a9f63a6a071457a3b9305dc87abe5f3b5b19
Reviewed-by: Stephan Binner <stephan.binner@basyskom.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/printsupport/dialogs/qprintdialog_unix.cpp   | 12 +++++++-----
 src/printsupport/kernel/qtprintsupportglobal_p.h |  1 +
 src/printsupport/widgets/qcupsjobwidget_p.h      |  5 ++---
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/printsupport')

diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index 4d8299b115..5527cd94f9 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qplatformdefs.h"
-#include <QtPrintSupport/qtprintsupportglobal.h>
+#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
 
 #ifndef QT_NO_PRINTDIALOG
 
@@ -66,8 +66,10 @@
 
 #ifndef QT_NO_CUPS
 #include <private/qcups_p.h>
+#if QT_CONFIG(cupsjobwidget)
 #include "qcupsjobwidget_p.h"
 #endif
+#endif
 
 /*
 
@@ -129,7 +131,7 @@ private:
     friend class QUnixPrintWidgetPrivate;
     Ui::QPrintPropertiesWidget widget;
     QDialogButtonBox *m_buttons;
-#ifndef QT_NO_CUPS
+#if QT_CONFIG(cupsjobwidget)
     QCupsJobWidget *m_jobOptions;
 #endif
 };
@@ -247,7 +249,7 @@ QPrintPropertiesDialog::QPrintPropertiesDialog(QAbstractPrintDialog *parent)
     connect(m_buttons->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(accept()));
     connect(m_buttons->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject()));
 
-#ifndef QT_NO_CUPS
+#if QT_CONFIG(cupsjobwidget)
     m_jobOptions = new QCupsJobWidget();
     widget.tabs->addTab(m_jobOptions, tr("Job Options"));
 #endif
@@ -260,7 +262,7 @@ QPrintPropertiesDialog::~QPrintPropertiesDialog()
 void QPrintPropertiesDialog::applyPrinterProperties(QPrinter *p)
 {
     widget.pageSetup->setPrinter(p);
-#ifndef QT_NO_CUPS
+#if QT_CONFIG(cupsjobwidget)
     m_jobOptions->setPrinter(p);
 #endif
 }
@@ -268,7 +270,7 @@ void QPrintPropertiesDialog::applyPrinterProperties(QPrinter *p)
 void QPrintPropertiesDialog::setupPrinter() const
 {
     widget.pageSetup->setupPrinter();
-#ifndef QT_NO_CUPS
+#if QT_CONFIG(cupsjobwidget)
     m_jobOptions->setupPrinter();
 #endif
 }
diff --git a/src/printsupport/kernel/qtprintsupportglobal_p.h b/src/printsupport/kernel/qtprintsupportglobal_p.h
index 2f6b924ed0..0623a08f1c 100644
--- a/src/printsupport/kernel/qtprintsupportglobal_p.h
+++ b/src/printsupport/kernel/qtprintsupportglobal_p.h
@@ -53,5 +53,6 @@
 
 #include <QtPrintSupport/qtprintsupportglobal.h>
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
+#include <QtPrintSupport/private/qtprintsupport-config_p.h>
 
 #endif // QTPRINTSUPPORTGLOBAL_P_H
diff --git a/src/printsupport/widgets/qcupsjobwidget_p.h b/src/printsupport/widgets/qcupsjobwidget_p.h
index 288aeac1aa..7d3c15938f 100644
--- a/src/printsupport/widgets/qcupsjobwidget_p.h
+++ b/src/printsupport/widgets/qcupsjobwidget_p.h
@@ -56,7 +56,8 @@
 #include <QtPrintSupport/private/qtprintsupportglobal_p.h>
 #include <private/qcups_p.h>
 
-#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) && !defined(QT_NO_DATETIMEEDIT)
+QT_REQUIRE_CONFIG(cupsjobwidget);
+
 #include <ui_qcupsjobwidget.h>
 
 QT_BEGIN_NAMESPACE
@@ -109,6 +110,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_PRINTER / QT_NO_CUPS
-
 #endif  // QCUPSJOBWIDGET_P_H
-- 
cgit v1.2.3