diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:54:52 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:54:53 +0200 |
commit | 15dc8b1d8e2db00dfcbe8d7f21150658f5de45b6 (patch) | |
tree | 6b9c908ca1cf0b1395fa91415f19b5adf8642ca7 /examples/widgets/widgets/imageviewer/imageviewer.cpp | |
parent | ecc83677006dc7dffcd2417b1e3cff88b0615756 (diff) | |
parent | 6234286925153279ca259cec04429fa584187b16 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I46ec05ade1c84e61f7f45562a218aa9ff55e2975
Diffstat (limited to 'examples/widgets/widgets/imageviewer/imageviewer.cpp')
-rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.cpp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp index 2fc8ff63de..83cf8bb7bc 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.cpp +++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp @@ -50,7 +50,24 @@ #include "imageviewer.h" -#include <QtWidgets> +#include <QApplication> +#include <QClipboard> +#include <QColorSpace> +#include <QDir> +#include <QFileDialog> +#include <QImageReader> +#include <QImageWriter> +#include <QLabel> +#include <QMenuBar> +#include <QMessageBox> +#include <QMimeData> +#include <QPainter> +#include <QScreen> +#include <QScrollArea> +#include <QScrollBar> +#include <QStandardPaths> +#include <QStatusBar> + #if defined(QT_PRINTSUPPORT_LIB) #include <QtPrintSupport/qtprintsupportglobal.h> #if QT_CONFIG(printdialog) @@ -60,8 +77,8 @@ //! [0] ImageViewer::ImageViewer(QWidget *parent) - : QMainWindow(parent), imageLabel(new QLabel), - scrollArea(new QScrollArea), scaleFactor(1) + : QMainWindow(parent), imageLabel(new QLabel) + , scrollArea(new QScrollArea) { imageLabel->setBackgroundRole(QPalette::Base); imageLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); |