diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-07-17 15:06:22 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-07-17 16:35:42 +0200 |
| commit | b2603b76655ac819e43c063bb6f16bc95f358083 (patch) | |
| tree | 0fbe2c367ebfffdb70e9e3f21a7cf408bafd9626 /examples/widgets/widgets | |
| parent | 99b94aadf875c822afb6c2580e43355ac392ac92 (diff) | |
| parent | 756266d01560157b7274e466b9ffc1b0e2ef9a1f (diff) | |
Merge remote-tracking branch 'origin/5.5' into HEAD
Conflicts:
src/plugins/platforms/windows/qwindowsopengltester.cpp
Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe
Diffstat (limited to 'examples/widgets/widgets')
| -rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp index 0b8513f090..93b88e9c18 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.cpp +++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp @@ -69,7 +69,9 @@ ImageViewer::ImageViewer() bool ImageViewer::loadFile(const QString &fileName) { - QImage image(fileName); + QImageReader reader(fileName); + reader.setAutoTransform(true); + const QImage image = reader.read(); if (image.isNull()) { QMessageBox::information(this, QGuiApplication::applicationDisplayName(), tr("Cannot load %1.").arg(QDir::toNativeSeparators(fileName))); |