From b842d4f953a642adea2529e585308c14749dd16f Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 26 May 2021 10:01:10 +0200 Subject: [PATCH] QmlDesignerIconProvider: Make use of FilePath for constructing icon file paths. Amends c17c805e43f6760328cc6225c9319738c1dbb361 Change-Id: I779cbf4525fb355878aaf0d9795702d951d60b70 Reviewed-by: Thomas Hartmann --- .../componentcore/qmldesignericonprovider.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp index a93ac8bbd00..cbc19b4362b 100644 --- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp +++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp @@ -42,12 +42,10 @@ QmlDesignerIconProvider::QmlDesignerIconProvider() } -static QString iconPath() +static Utils::FilePath iconPath() { return Core::ICore::resourcePath( - "qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/") - .toString() - + "/"; + "qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/"); } QPixmap QmlDesignerIconProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) @@ -72,18 +70,15 @@ QPixmap QmlDesignerIconProvider::getPixmap(const QString &id) else if (id == "plus") result = Utils::Icons::PLUS_TOOLBAR.pixmap(); else if (id == "expression") - result = Icon({ - { iconPath() + QLatin1String("expression.png"), Theme::QmlDesigner_HighlightColor}}).pixmap(); + result = Icon({{iconPath() / "expression.png", Theme::QmlDesigner_HighlightColor}}).pixmap(); else if (id == "placeholder") - result = Icon(iconPath() + "placeholder.png").pixmap(); + result = Icon(iconPath() / "placeholder.png").pixmap(); else if (id == "submenu") - result = Icon(iconPath() + "submenu.png").pixmap(); + result = Icon(iconPath() / "submenu.png").pixmap(); else if (id == "up-arrow") - result = Icon({ - { iconPath() + QLatin1String("up-arrow.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + result = Icon({{iconPath() / "up-arrow.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else if (id == "down-arrow") - result = Icon({ - { iconPath() + QLatin1String("down-arrow.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + result = Icon({{iconPath() / "down-arrow.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else if (id == "checkbox-indicator") result = Icon({ { ":/qmldesigner/images/checkbox_indicator.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap();