feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic02df53b880d0861d9d9ea0df3e0d381ae99f350
This commit is contained in:
Eike Ziller
2022-03-11 09:50:48 +01:00
parent a863958aa4 2829412e15
commit cd8c4ced81
184 changed files with 3566 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/imageviewer/imageviewerfile.cpp
View File

@@ -111,7 +111,7 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString,
if (format.startsWith("svg")) {
m_tempSvgItem = new QGraphicsSvgItem(fileName);
QRectF bound = m_tempSvgItem->boundingRect();
if (qFuzzyIsNull(bound.width()) && qFuzzyIsNull(bound.height())) {
if (!bound.isValid() || (qFuzzyIsNull(bound.width()) && qFuzzyIsNull(bound.height()))) {
delete m_tempSvgItem;
m_tempSvgItem = nullptr;
if (errorString)
@@ -123,8 +123,17 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString,
} else
#endif
if (QMovie::supportedFormats().contains(format)) {
m_type = TypeMovie;
m_movie = new QMovie(fileName, QByteArray(), this);
// force reading movie/image data, so we can catch completely invalid movies/images early:
m_movie->jumpToNextFrame();
if (!m_movie->isValid()) {
if (errorString)
*errorString = tr("Failed to read image.");
delete m_movie;
m_movie = nullptr;
return OpenResult::CannotHandle;
}
m_type = TypeMovie;
m_movie->setCacheMode(QMovie::CacheAll);
connect(
m_movie,