From 1555add26f954bcb3ffd64e28e546d91ae36fda7 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 3 May 2024 14:23:07 +0200 Subject: [PATCH] QmlProject: Also add support for gif Change-Id: I46400e8bd605142401ab941e45baba1fa4b27fc0 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Burak Hancerli Reviewed-by: Thomas Hartmann (cherry picked from commit 0f2d15f16cd4457121490d02040ab5f23466083c) --- .../buildsystem/projectitem/converters.cpp | 3 ++- .../data/converter/test-set-1/testfile.qmltojson | 6 ++++-- .../data/converter/test-set-2/testfile.qmltojson | 3 ++- .../data/converter/test-set-3/testfile.qmltojson | 6 ++++-- .../data/converter/test-set-mcu-1/testfile.qmltojson | 3 ++- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp b/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp index d9536484b7d..82ba1fc2e41 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp +++ b/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp @@ -18,7 +18,8 @@ const static QStringList imageFilesFilter{QStringLiteral("*.jpeg"), QStringLiteral("*.bmp"), QStringLiteral("*.ttf"), QStringLiteral("*.tiff"), - QStringLiteral("*.webp")}; + QStringLiteral("*.webp"), + QStringLiteral("*.gif")}; QString jsonValueToString(const QJsonValue &val, int indentationLevel, bool indented); diff --git a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmltojson b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmltojson index 39c9517b991..e362cdf8860 100644 --- a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmltojson +++ b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-1/testfile.qmltojson @@ -79,7 +79,8 @@ "*.bmp", "*.ttf", "*.tiff", - "*.webp" + "*.webp", + "*.gif" ], "mcuProperties": { }, @@ -101,7 +102,8 @@ "*.bmp", "*.ttf", "*.tiff", - "*.webp" + "*.webp", + "*.gif" ], "mcuProperties": { }, diff --git a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-2/testfile.qmltojson b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-2/testfile.qmltojson index 4444bbabce6..80eaf6fefa3 100644 --- a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-2/testfile.qmltojson +++ b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-2/testfile.qmltojson @@ -49,7 +49,8 @@ "*.bmp", "*.ttf", "*.tiff", - "*.webp" + "*.webp", + "*.gif" ], "mcuProperties": { }, diff --git a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-3/testfile.qmltojson b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-3/testfile.qmltojson index 39c9517b991..e362cdf8860 100644 --- a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-3/testfile.qmltojson +++ b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-3/testfile.qmltojson @@ -79,7 +79,8 @@ "*.bmp", "*.ttf", "*.tiff", - "*.webp" + "*.webp", + "*.gif" ], "mcuProperties": { }, @@ -101,7 +102,8 @@ "*.bmp", "*.ttf", "*.tiff", - "*.webp" + "*.webp", + "*.gif" ], "mcuProperties": { }, diff --git a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-mcu-1/testfile.qmltojson b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-mcu-1/testfile.qmltojson index 67eb8cc4ed2..634623c9cf2 100644 --- a/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-mcu-1/testfile.qmltojson +++ b/tests/unit/tests/unittests/qmlprojectmanager/data/converter/test-set-mcu-1/testfile.qmltojson @@ -52,7 +52,8 @@ "*.bmp", "*.ttf", "*.tiff", - "*.webp" + "*.webp", + "*.gif" ], "mcuProperties": { },