Scripting: Allow referencing built-in icons from Action.icon

See also 4b3ef42.
mapeditor · Jul 6, 2023 · c61c3fd · c61c3fd
1 parent d691d52
commit c61c3fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/tiled/scriptedaction.cpp b/src/tiled/scriptedaction.cpp
@@ -21,7 +21,6 @@
 #include "scriptedaction.h"
 
 #include "scriptmanager.h"
-#include "utils.h"
 
 #include <QJSEngine>
 
@@ -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
@@ -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 });