From 8ad5967793f43bda2c38e3f9dddd3d2b6fef5390 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 27 Sep 2018 13:14:24 +0200 Subject: Do not include qprintdialog in a kernel/ file The only use is for ::tr so use QCoreApplication::translate Automatic is not used in dialog/ anyway so there's no translation to reuse Change-Id: I0c993e87f46384a0f09d83c9b5e96de5366f1eb9 Reviewed-by: Andy Shaw --- src/printsupport/kernel/qplatformprintdevice.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/printsupport/kernel/qplatformprintdevice.cpp') diff --git a/src/printsupport/kernel/qplatformprintdevice.cpp b/src/printsupport/kernel/qplatformprintdevice.cpp index 23a92fc2a1..d8d568d6fa 100644 --- a/src/printsupport/kernel/qplatformprintdevice.cpp +++ b/src/printsupport/kernel/qplatformprintdevice.cpp @@ -40,10 +40,8 @@ #include "qplatformprintdevice.h" #include "qprintdevice_p.h" -#if QT_CONFIG(printdialog) -#include "qprintdialog.h" -#endif +#include #include QT_BEGIN_NAMESPACE @@ -291,11 +289,7 @@ 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.name = QCoreApplication::translate("Print Device Input Slot", "Automatic"); input.id = QPrint::Auto; return input; } @@ -315,11 +309,7 @@ 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.name = QCoreApplication::translate("Print Device Output Bin", "Automatic"); output.id = QPrint::AutoOutputBin; return output; } -- cgit v1.2.3