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/widgets/imageviewer/imageviewer.h | |
| parent | 9f9049b486a47aef0c7e2e3852b20aa4ffdce748 (diff) | |
| parent | ff922e7b87de147797fbd759167878aec7625f0c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'examples/widgets/widgets/imageviewer/imageviewer.h')
| -rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.h b/examples/widgets/widgets/imageviewer/imageviewer.h index 49c7ac205b..9c8388d470 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.h +++ b/examples/widgets/widgets/imageviewer/imageviewer.h @@ -53,8 +53,12 @@ #include <QMainWindow> #include <QImage> -#ifndef QT_NO_PRINTER -#include <QPrinter> +#if defined(QT_PRINTSUPPORT_LIB) +# include <QtPrintSupport/qtprintsupportglobal.h> + +# if QT_CONFIG(printer) +# include <QPrinter> +# endif #endif QT_BEGIN_NAMESPACE @@ -100,7 +104,7 @@ private: QScrollArea *scrollArea; double scaleFactor = 1; -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printer) QPrinter printer; #endif |