diff options
author | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-29 17:35:58 +0200 |
---|---|---|
committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-30 17:21:26 +0000 |
commit | dbeb748de30bcc0e0615d21c593b761408404950 (patch) | |
tree | 63868dc50be0138424f82598daa81ded596bd26f /examples/widgets/richtext | |
parent | f209215c0d96c8badcc14a3fc1cd8a6b0e56625c (diff) |
Convert features.printdialog to QT_[REQUIRE_]CONFIG
Change-Id: Ifb016ae2a0986b436f788b34513c81ea91f3804a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'examples/widgets/richtext')
-rw-r--r-- | examples/widgets/richtext/orderform/mainwindow.cpp | 7 | ||||
-rw-r--r-- | examples/widgets/richtext/textedit/textedit.cpp | 13 |
2 files changed, 15 insertions, 5 deletions
diff --git a/examples/widgets/richtext/orderform/mainwindow.cpp b/examples/widgets/richtext/orderform/mainwindow.cpp index 35934bee72..030072978e 100644 --- a/examples/widgets/richtext/orderform/mainwindow.cpp +++ b/examples/widgets/richtext/orderform/mainwindow.cpp @@ -49,10 +49,13 @@ ****************************************************************************/ #include <QtWidgets> -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include <QtPrintSupport/qtprintsupportglobal.h> +#if QT_CONFIG(printdialog) #include <QPrinter> #include <QPrintDialog> #endif +#endif #include "detailsdialog.h" #include "mainwindow.h" @@ -245,7 +248,7 @@ void MainWindow::openDialog() //! [17] void MainWindow::printFile() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) QTextEdit *editor = static_cast<QTextEdit*>(letters->currentWidget()); //! [18] QPrinter printer; diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index 140ae478ff..fe4ee4f499 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -71,11 +71,18 @@ #include <QCloseEvent> #include <QMessageBox> #include <QMimeData> -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include <QtPrintSupport/qtprintsupportglobal.h> +#if QT_CONFIG(printer) +#if QT_CONFIG(printdialog) #include <QPrintDialog> +#endif #include <QPrinter> +#if QT_CONFIG(printpreviewdialog) #include <QPrintPreviewDialog> #endif +#endif +#endif #include "textedit.h" @@ -474,7 +481,7 @@ bool TextEdit::fileSaveAs() void TextEdit::filePrint() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) QPrinter printer(QPrinter::HighResolution); QPrintDialog *dlg = new QPrintDialog(&printer, this); if (textEdit->textCursor().hasSelection()) @@ -488,7 +495,7 @@ void TextEdit::filePrint() void TextEdit::filePrintPreview() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printpreviewdialog) QPrinter printer(QPrinter::HighResolution); QPrintPreviewDialog preview(&printer, this); connect(&preview, &QPrintPreviewDialog::paintRequested, this, &TextEdit::printPreview); |