diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-10-08 15:58:02 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-10-08 15:58:02 +0200 |
| commit | 7bb21fcfff2b0fe6c6248ff85cdafae452ef7c8c (patch) | |
| tree | 99e8ecdf74cca06f1ba9915ff96028f48edddf01 /src/plugins/imageviewer/imageviewerfile.cpp | |
| parent | e454c918386c42478454cb64dde841fe4c49e18c (diff) | |
| parent | 7c2121bcfdff8a652b9cb6d190829af0be62cf5f (diff) | |
Merge remote-tracking branch 'origin/5.0' into 6.0
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: I87b19a51b1950d19eff95086848b0728ba2f0ebd
Diffstat (limited to 'src/plugins/imageviewer/imageviewerfile.cpp')
| -rw-r--r-- | src/plugins/imageviewer/imageviewerfile.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index 2a6204e11d..3fe26890d0 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -126,7 +126,15 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString, m_type = TypeMovie; m_movie = new QMovie(fileName, QByteArray(), this); m_movie->setCacheMode(QMovie::CacheAll); - connect(m_movie, &QMovie::finished, m_movie, &QMovie::start); + connect( + m_movie, + &QMovie::finished, + m_movie, + [this] { + if (m_movie->isValid()) + m_movie->start(); + }, + Qt::QueuedConnection); connect(m_movie, &QMovie::resized, this, &ImageViewerFile::imageSizeChanged); m_movie->start(); m_isPaused = false; // force update |