diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:24 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-03-11 11:27:49 +0100 |
| commit | 116d68f105db025f56c1fd5115ff4924bc22d7c2 (patch) | |
| tree | ae04596b19c34eccc60ff7477da6a0166c5f82b1 /examples/widgets/widgets | |
| parent | 52de905d0ec6159d3a1e7ad63fed018b5c6973d2 (diff) | |
| parent | bd3c82f8db4391fc1d6d3338827356143fd598dd (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/plugin/qlibrary.cpp
src/corelib/plugin/qlibrary_unix.cpp
src/corelib/plugin/qpluginloader.cpp
Change-Id: I866feaaa2a4936ee5389679724c8471a5b4b583d
Diffstat (limited to 'examples/widgets/widgets')
| -rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.cpp | 9 | ||||
| -rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.h | 10 |
2 files changed, 12 insertions, 7 deletions
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp index 7a0f49308b..7de0c7c45b 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.cpp +++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp @@ -69,10 +69,11 @@ #include <QStatusBar> #if defined(QT_PRINTSUPPORT_LIB) -#include <QtPrintSupport/qtprintsupportglobal.h> -#if QT_CONFIG(printdialog) -#include <QPrintDialog> -#endif +# include <QtPrintSupport/qtprintsupportglobal.h> + +# if QT_CONFIG(printdialog) +# include <QPrintDialog> +# endif #endif //! [0] 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 |