From c61c3fd15925799aeda712bb0de54acf430dd76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 6 Jul 2023 13:04:52 +0200 Subject: [PATCH] Scripting: Allow referencing built-in icons from Action.icon See also 4b3ef429a7430304c035fc0f68f003102c3ecc27. --- src/tiled/scriptedaction.cpp | 3 +-- src/tiled/scriptedtool.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/tiled/scriptedaction.cpp b/src/tiled/scriptedaction.cpp index 5b4bd894d2..c36ea99cfb 100644 --- a/src/tiled/scriptedaction.cpp +++ b/src/tiled/scriptedaction.cpp @@ -21,7 +21,6 @@ #include "scriptedaction.h" #include "scriptmanager.h" -#include "utils.h" #include @@ -62,7 +61,7 @@ void ScriptedAction::setIconFileName(const QString &fileName) QString iconFile = fileName; const QString ext = QStringLiteral("ext:"); - if (!iconFile.startsWith(ext)) + if (!iconFile.startsWith(ext) && !iconFile.startsWith(QLatin1Char(':'))) iconFile.prepend(ext); setIcon(QIcon { iconFile }); diff --git a/src/tiled/scriptedtool.cpp b/src/tiled/scriptedtool.cpp index e6e304225c..698b40c623 100644 --- a/src/tiled/scriptedtool.cpp +++ b/src/tiled/scriptedtool.cpp @@ -260,7 +260,7 @@ void ScriptedTool::setIconFileName(const QString &fileName) QString iconFile = fileName; const QString ext = QStringLiteral("ext:"); - if (!iconFile.startsWith(ext) && !iconFile.startsWith(QLatin1String(":"))) + if (!iconFile.startsWith(ext) && !iconFile.startsWith(QLatin1Char(':'))) iconFile.prepend(ext); setIcon(QIcon { iconFile });