feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Lua: Correctly load QIcon from file path for ToggleAspect

Browse Source 
Change-Id: Ie2fd51b9783930105d1d43591b30a19427058fb8
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Krzysztof Chrusciel
2025-03-18 12:33:37 +01:00
parent d25878399a
commit 2b53d28690
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/lua/bindings/settings.cpp
View File

@@ -2,6 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "../luaengine.h" #include "../luaengine.h"
#include "utils.h"
#include <utils/aspects.h> #include <utils/aspects.h>
#include <utils/environment.h> #include <utils/environment.h>
@@ -479,11 +480,11 @@ void setupSettingsModule()
options, options,
[](ToggleAspect *aspect, const std::string &key, const sol::object &value) { [](ToggleAspect *aspect, const std::string &key, const sol::object &value) {
if (key == "offIcon") if (key == "offIcon")
aspect->setOffIcon(QIcon(value.as<QString>())); aspect->setOffIcon(toIcon(value.as<IconFilePathOrString>())->icon());
else if (key == "offTooltip") else if (key == "offTooltip")
aspect->setOffTooltip(value.as<QString>()); aspect->setOffTooltip(value.as<QString>());
else if (key == "onIcon") else if (key == "onIcon")
aspect->setOnIcon(QIcon(value.as<QString>())); aspect->setOnIcon(toIcon(value.as<IconFilePathOrString>())->icon());
else if (key == "onTooltip") else if (key == "onTooltip")
aspect->setOnTooltip(value.as<QString>()); aspect->setOnTooltip(value.as<QString>());
else if (key == "onText") else if (key == "onText")