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

ImageViewer: Add up-to-date mimetypes (and add webp mimetype)

Browse Source 
The list of mimetypes was missing new types like tga, dds and webp.
Just ask QImageReader::supportedMimeTypes() for the supported types,
which is also easier to maintain.

Task-number: QTBUG-45061
Change-Id: I80573da868088915b8d746c56374786e5e36903c
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2015-03-18 16:04:10 +01:00
committed by hjk
parent ec9f3ee79e
commit 4514dbfd8c
4 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/imageviewer/imageviewerfactory.cpp
View File

@@ -47,29 +47,14 @@ ImageViewerFactory::ImageViewerFactory(QObject *parent) :
setId(Constants::IMAGEVIEWER_ID);
setDisplayName(qApp->translate("OpenWith::Editors", Constants::IMAGEVIEWER_DISPLAY_NAME));
QMap<QByteArray, const char *> possibleMimeTypes;
possibleMimeTypes.insert("bmp", "image/bmp");
possibleMimeTypes.insert("gif", "image/gif");
possibleMimeTypes.insert("ico", "image/x-icon");
possibleMimeTypes.insert("jpeg","image/jpeg");
possibleMimeTypes.insert("jpg", "image/jpeg");
possibleMimeTypes.insert("mng", "video/x-mng");
possibleMimeTypes.insert("pbm", "image/x-portable-bitmap");
possibleMimeTypes.insert("pgm", "image/x-portable-graymap");
possibleMimeTypes.insert("png", "image/png");
possibleMimeTypes.insert("ppm", "image/x-portable-pixmap");
possibleMimeTypes.insert("svg", "image/svg+xml");
possibleMimeTypes.insert("tif", "image/tiff");
possibleMimeTypes.insert("tiff","image/tiff");
possibleMimeTypes.insert("xbm", "image/xbm");
possibleMimeTypes.insert("xpm", "image/xpm");
const QList<QByteArray> supportedMimeTypes = QImageReader::supportedMimeTypes();
foreach (const QByteArray &format, supportedMimeTypes)
addMimeType(format.constData());
QList<QByteArray> supportedFormats = QImageReader::supportedImageFormats();
foreach (const QByteArray &format, supportedFormats) {
const char *value = possibleMimeTypes.value(format);
if (value)
addMimeType(value);
}
#if (QT_VERSION < QT_VERSION_CHECK(5, 5, 0)) && !QT_NO_SVGRENDERER
// Workaround for https://codereview.qt-project.org/108693
addMimeType("image/svg+xml");
#endif
}
Core::IEditor *ImageViewerFactory::createEditor()