Merge remote-tracking branch 'gerrit/dev' into HEAD

5 files changed, 23 insertions, 5 deletions

diff --git a/src/printsupport/configure.json b/src/printsupport/configure.json
index 439f2dbdd8..dfef0bcd6c 100644
--- a/src/printsupport/configure.json
+++ b/src/printsupport/configure.json
@@ -28,7 +28,13 @@
             "label": "CUPS",
             "purpose": "Provides support for the Common Unix Printing System.",
             "section": "Painting",
-            "condition": "libs.cups",
+            "condition": "libs.cups && features.printer",
+            "output": [ "privateFeature", "feature" ]
+        },
+        "cupsjobwidget": {
+            "label": "CUPS job control widget",
+            "section": "Widgets",
+            "condition": "features.cups && features.calendarwidget && features.datetimeedit && features.groupbox && features.combobox",
             "output": [ "privateFeature", "feature" ]
         },
         "printer": {
@@ -49,7 +55,7 @@
             "label": "QPrintDialog",
             "purpose": "Provides a dialog widget for specifying printer configuration.",
             "section": "Dialogs",
-            "condition": "features.printer && features.combobox && features.buttongroup && features.spinbox && features.treeview && features.tabwidget",
+            "condition": "features.printer && features.combobox && features.buttongroup && features.spinbox && features.treeview && features.tabwidget && features.datetimeedit",
             "output": [ "publicFeature", "feature" ]
         },
         "printpreviewdialog": {
diff --git a/src/printsupport/kernel/qplatformprintdevice.cpp b/src/printsupport/kernel/qplatformprintdevice.cpp
index eabd7e7295..cbb67aefdc 100644
--- a/src/printsupport/kernel/qplatformprintdevice.cpp
+++ b/src/printsupport/kernel/qplatformprintdevice.cpp
@@ -302,7 +302,11 @@ QPrint::InputSlot QPlatformPrintDevice::defaultInputSlot() const
 {
     QPrint::InputSlot input;
     input.key = QByteArrayLiteral("Auto");
+#if QT_CONFIG(printdialog)
     input.name = QPrintDialog::tr("Automatic");
+#else
+    input.name = QString::fromLatin1("Automatic");
+#endif
     input.id = QPrint::Auto;
     return input;
 }
@@ -322,7 +326,11 @@ QPrint::OutputBin QPlatformPrintDevice::defaultOutputBin() const
 {
     QPrint::OutputBin output;
     output.key = QByteArrayLiteral("Auto");
+#if QT_CONFIG(printdialog)
     output.name = QPrintDialog::tr("Automatic");
+#else
+    output.name = QString::fromLatin1("Automatic");
+#endif
     output.id = QPrint::AutoOutputBin;
     return output;
 }
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index bcc0363681..53bed87dfc 100644
--- a/src/printsupport/kernel/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -2200,4 +2200,8 @@ QPrinter::PrintRange QPrinter::printRange() const
 
 QT_END_NAMESPACE
 
+#elif defined(Q_OS_WINRT)
+QT_BEGIN_NAMESPACE
+bool Q_PRINTSUPPORT_EXPORT qt_winrt_export_lib_creation_variable;
+QT_END_NAMESPACE
 #endif // QT_NO_PRINTER
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