AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix printsupport compilation with -no-feature...

Browse Source 
Change-Id: I881e736aefd4068965edb2a57f4436ee43d2bb93
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Paul Olav Tvete 2017-01-20 14:41:46 +01:00
parent 64e977cfac
commit 447ca99191
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/printsupport/configure.json
View File

@ -31,6 +31,12 @@
"condition": "libs.cups",
"output": [ "privateFeature", "feature" ]
},
"cupsjobwidget": {
"label": "CUPS job control widget",
"section": "Widgets",
"condition": "features.cups && features.calendarwidget && features.datetimeedit && features.groupbox",
"output": [ "privateFeature", "feature" ]
},
"printer": {
"label": "QPrinter",
"purpose": "Provides a printer backend of QPainter.",
@ -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": {

8
src/printsupport/kernel/qplatformprintdevice.cpp
View File

@ -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;
}

2
src/printsupport/widgets/qcupsjobwidget_p.h
View File

@ -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

4
src/printsupport/widgets/widgets.pri
View File

@ -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