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/widgets | |
| 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/widgets')
| -rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.cpp | 7 | ||||
| -rw-r--r-- | examples/widgets/widgets/scribble/scribblearea.cpp | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp index f2570c18c1..327abf7e43 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.cpp +++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp @@ -49,9 +49,12 @@ ****************************************************************************/ #include <QtWidgets> -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include <QtPrintSupport/qtprintsupportglobal.h> +#if QT_CONFIG(printdialog) #include <QPrintDialog> #endif +#endif #include "imageviewer.h" @@ -180,7 +183,7 @@ void ImageViewer::print() //! [5] //! [6] { Q_ASSERT(imageLabel->pixmap()); -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) //! [6] //! [7] QPrintDialog dialog(&printer, this); //! [7] //! [8] diff --git a/examples/widgets/widgets/scribble/scribblearea.cpp b/examples/widgets/widgets/scribble/scribblearea.cpp index 2ae7ee027b..d32a29697b 100644 --- a/examples/widgets/widgets/scribble/scribblearea.cpp +++ b/examples/widgets/widgets/scribble/scribblearea.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 "scribblearea.h" @@ -210,7 +213,7 @@ void ScribbleArea::resizeImage(QImage *image, const QSize &newSize) //! [21] void ScribbleArea::print() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) QPrinter printer(QPrinter::HighResolution); QPrintDialog printDialog(&printer, this); @@ -224,6 +227,6 @@ void ScribbleArea::print() painter.setWindow(image.rect()); painter.drawImage(0, 0, image); } -#endif // QT_NO_PRINTER +#endif // QT_CONFIG(printdialog) } //! [22] |