forked from qt-creator/qt-creator
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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user