diff options
author | Knud Dollereder <knud.dollereder@qt.io> | 2021-12-08 12:11:40 +0100 |
---|---|---|
committer | Knud Dollereder <knud.dollereder@qt.io> | 2021-12-08 13:13:37 +0000 |
commit | b8a71220978d2c0d488f2d668aebba5697c6cbcb (patch) | |
tree | f1be914ac3c8b4306f99eac5004f3cd4e3406c0f | |
parent | 175ddb79e8fe17583806a7cea5f48c54b85b0304 (diff) |
Register image formats supported by QImageReader and hdr
The list of supported image file formats of the asset loader
was missing an entry for the jpeg extension.
This is now fixed by generating this list out from the result
of QImageReader::supportedFormats with the addition of the
.hdr format.
Fixes: QDS-5713
Change-Id: I65ccbe4c02e1b4eb725b6bb14d154bbfddf8fa9c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r-- | src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 4ac3692589..c521b653dd 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -57,6 +57,7 @@ #include <QGraphicsLinearLayout> #include <QHBoxLayout> +#include <QImageReader> #include <QMessageBox> #include <QMimeData> @@ -1549,9 +1550,13 @@ void DesignerActionManager::createDefaultAddResourceHandler() registerAddResourceHandler(AddResourceHandler(category, ext, op)); }; + auto transformer = [](const QByteArray& format) -> QString { return QString("*.") + format; }; + auto imageFormats = Utils::transform(QImageReader::supportedImageFormats(), transformer); + imageFormats.push_back("*.hdr"); + // The filters will be displayed in reverse order to these lists in file dialog, // so declare most common types last - registerHandlers({"*.webp", "*.hdr", "*.svg", "*.bmp", "*.jpg", "*.png"}, + registerHandlers(imageFormats, ModelNodeOperations::addImageToProject, ComponentCoreConstants::addImagesDisplayString); registerHandlers({"*.otf", "*.ttf"}, |