diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 20:43:50 +0100 |
| commit | c2f167b41284cee3570434deba85f26f14ff241f (patch) | |
| tree | b0f52f86a8df266547d7ec7afa22d0c0d68d3532 /examples/widgets/richtext/textedit/textedit.cpp | |
| parent | 9f9049b486a47aef0c7e2e3852b20aa4ffdce748 (diff) | |
| parent | ff922e7b87de147797fbd759167878aec7625f0c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'examples/widgets/richtext/textedit/textedit.cpp')
| -rw-r--r-- | examples/widgets/richtext/textedit/textedit.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index 5d27e7df0c..7cfe3f6c05 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -197,7 +197,7 @@ void TextEdit::setupFileActions() a->setPriority(QAction::LowPriority); menu->addSeparator(); -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printer) const QIcon printIcon = QIcon::fromTheme("document-print", QIcon(rsrcPath + "/fileprint.png")); a = menu->addAction(printIcon, tr("&Print..."), this, &TextEdit::filePrint); a->setPriority(QAction::LowPriority); @@ -559,7 +559,7 @@ void TextEdit::filePrint() void TextEdit::filePrintPreview() { -#if QT_CONFIG(printpreviewdialog) +#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printpreviewdialog) QPrinter printer(QPrinter::HighResolution); QPrintPreviewDialog preview(&printer, this); connect(&preview, &QPrintPreviewDialog::paintRequested, this, &TextEdit::printPreview); @@ -569,17 +569,17 @@ void TextEdit::filePrintPreview() void TextEdit::printPreview(QPrinter *printer) { -#ifdef QT_NO_PRINTER - Q_UNUSED(printer); -#else +#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printer) textEdit->print(printer); +#else + Q_UNUSED(printer) #endif } void TextEdit::filePrintPdf() { -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printer) //! [0] QFileDialog fileDialog(this, tr("Export PDF")); fileDialog.setAcceptMode(QFileDialog::AcceptSave); |