From 94bf781b0e2248d0662d125f571c4d0a52f78659 Mon Sep 17 00:00:00 2001 From: Andrii Semkiv Date: Tue, 25 Mar 2025 11:11:08 +0100 Subject: [PATCH] QML Project Manager: Stop mistreating fonts Font files were mistakenly treated as image files. Change-Id: I0946f6f46767e541a0ff87a6b3f2969d4f6bc2d9 Reviewed-by: Burak Hancerli Reviewed-by: Thomas Hartmann --- .../qmlprojectmanager/qmlprojectexporter/filetypes.cpp | 6 +++--- .../data/converter/test-set-1/testfile.qmltojson | 2 -- .../data/converter/test-set-2/testfile.qmltojson | 1 - .../data/converter/test-set-3/testfile.qmltojson | 2 -- .../data/converter/test-set-mcu-1/testfile.qmltojson | 1 - 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/plugins/qmlprojectmanager/qmlprojectexporter/filetypes.cpp b/src/plugins/qmlprojectmanager/qmlprojectexporter/filetypes.cpp index 3faf93aae4f..6a1f8c742e1 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectexporter/filetypes.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectexporter/filetypes.cpp @@ -7,9 +7,9 @@ namespace QmlProjectManager { QStringList imageFiles(const std::function &transformer) { - static const QStringList suffixes = {"bmp", "dae", "gif", "hdr", "ico", "jpeg", "jpg", - "ktx", "pbm", "pgm", "png", "ppm", "svg", "svgz", - "tif", "tiff", "ttf", "webp", "xbm", "xpm", "tga"}; + static const QStringList suffixes = {"bmp", "dae", "gif", "hdr", "ico", "jpeg", "jpg", + "ktx", "pbm", "pgm", "png", "ppm", "svg", "svgz", + "tif", "tiff", "webp", "xbm", "xpm", "tga"}; if (transformer) { QStringList result; 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 e07953bb70d..1cf94003030 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 @@ -86,7 +86,6 @@ "*.svgz", "*.tif", "*.tiff", - "*.ttf", "*.webp", "*.xbm", "*.xpm", @@ -119,7 +118,6 @@ "*.svgz", "*.tif", "*.tiff", - "*.ttf", "*.webp", "*.xbm", "*.xpm", 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 c7582958178..a740c86a726 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 @@ -56,7 +56,6 @@ "*.svgz", "*.tif", "*.tiff", - "*.ttf", "*.webp", "*.xbm", "*.xpm", 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 b42b415604d..f65349cc6ad 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 @@ -87,7 +87,6 @@ "*.svgz", "*.tif", "*.tiff", - "*.ttf", "*.webp", "*.xbm", "*.xpm", @@ -120,7 +119,6 @@ "*.svgz", "*.tif", "*.tiff", - "*.ttf", "*.webp", "*.xbm", "*.xpm", 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 66a6269e858..450bab3191d 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 @@ -59,7 +59,6 @@ "*.svgz", "*.tif", "*.tiff", - "*.ttf", "*.webp", "*.xbm", "*.xpm",