diff options
Diffstat (limited to 'src/printsupport/dialogs/qprintdialog_unix.cpp')
-rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index a73e7dd427..aab5e2c7f0 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -83,7 +83,7 @@ Print dialog class declarations Layout in qprintpropertieswidget.ui */ -static void initResources() +static void _q_pdu_initResources() { Q_INIT_RESOURCE(qprintdialog); } @@ -322,7 +322,7 @@ void QPrintPropertiesDialog::reject() void QPrintPropertiesDialog::accept() { -#if QT_CONFIG(cups) +#if QT_CONFIG(cups) && QT_CONFIG(messagebox) if (widget.pageSetup->hasPpdConflict()) { widget.tabs->setCurrentWidget(widget.tabPage); const QMessageBox::StandardButton answer = QMessageBox::warning(this, tr("Page Setup Conflicts"), @@ -584,7 +584,7 @@ QPrintDialogPrivate::QPrintDialogPrivate() : top(nullptr), bottom(nullptr), buttons(nullptr), collapseButton(nullptr), explicitDuplexMode(QPrint::DuplexAuto) { - initResources(); + _q_pdu_initResources(); } QPrintDialogPrivate::~QPrintDialogPrivate() @@ -990,7 +990,7 @@ int QPrintDialog::exec() void QPrintDialog::accept() { Q_D(QPrintDialog); -#if QT_CONFIG(cups) +#if QT_CONFIG(cups) && QT_CONFIG(messagebox) if (d->options.pagesRadioButton->isChecked() && printer()->pageRanges().isEmpty()) { QMessageBox::critical(this, tr("Invalid Pages Definition"), tr("%1 does not follow the correct syntax. Please use ',' to separate " @@ -1328,9 +1328,9 @@ QUnixPrintWidget::QUnixPrintWidget(QPrinter *printer, QWidget *parent) cur = home; else if (!cur.endsWith(u'/')) cur += u'/'; - if (QGuiApplication::platformName() == QStringLiteral("xcb")) { + if (QGuiApplication::platformName() == "xcb"_L1) { if (printer->docName().isEmpty()) { - cur += QStringLiteral("print.pdf"); + cur += "print.pdf"_L1; } else { #if QT_CONFIG(regularexpression) const QRegularExpression re(QStringLiteral("(.*)\\.\\S+")); @@ -1340,7 +1340,7 @@ QUnixPrintWidget::QUnixPrintWidget(QPrinter *printer, QWidget *parent) else #endif cur += printer->docName(); - cur += QStringLiteral(".pdf"); + cur += ".pdf"_L1; } } // xcb |