From 447ca99191a8659c3b4aa57847f674a49a18f41c Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Fri, 20 Jan 2017 14:41:46 +0100
Subject: Fix printsupport compilation with -no-feature...

Change-Id: I881e736aefd4068965edb2a57f4436ee43d2bb93
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/printsupport/widgets/qcupsjobwidget_p.h | 2 +-
 src/printsupport/widgets/widgets.pri        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/printsupport/widgets')

diff --git a/src/printsupport/widgets/qcupsjobwidget_p.h b/src/printsupport/widgets/qcupsjobwidget_p.h
index 5320818f30..288aeac1aa 100644
--- a/src/printsupport/widgets/qcupsjobwidget_p.h
+++ b/src/printsupport/widgets/qcupsjobwidget_p.h
@@ -56,7 +56,7 @@
 #include <QtPrintSupport/private/qtprintsupportglobal_p.h>
 #include <private/qcups_p.h>
 
-#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS)
+#if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) && !defined(QT_NO_DATETIMEEDIT)
 #include <ui_qcupsjobwidget.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/printsupport/widgets/widgets.pri b/src/printsupport/widgets/widgets.pri
index 8a98da1718..505983778e 100644
--- a/src/printsupport/widgets/widgets.pri
+++ b/src/printsupport/widgets/widgets.pri
@@ -1,11 +1,11 @@
 HEADERS += widgets/qprintpreviewwidget.h
 SOURCES += widgets/qprintpreviewwidget.cpp
 
-unix:!darwin:qtConfig(cups) {
+unix:!darwin:qtConfig(cups):qtConfig(cupsjobwidget) {
     HEADERS += widgets/qcupsjobwidget_p.h
     SOURCES += widgets/qcupsjobwidget.cpp
     FORMS += widgets/qcupsjobwidget.ui
 
-    INCLUDEPATH += $$PWD
 }
 
+INCLUDEPATH += $$PWD
-- 
cgit v1.2.3