mirror of
https://github.com/gamecreature/QtAwesome.git
synced 2025-12-16 19:57:03 +03:00
fix #66, Style name parsing
Some checks failed
CMake / macos-12-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / macos-12-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / macos-12-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / macos-12-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / macos-12-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / macos-12-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / windows-2019-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / windows-2019-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / windows-2019-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / windows-2019-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / windows-2019-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.7.0-shared-ON (push) Has been cancelled
Some checks failed
CMake / macos-12-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / macos-12-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / macos-12-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / macos-12-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / macos-12-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / macos-12-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / macos-12-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / macos-13-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / macos-13-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-20.04-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / windows-2019-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / windows-2019-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / windows-2019-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.4.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.5.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.5.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / windows-2019-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-5.15.2-shared-OFF (push) Has been cancelled
CMake / windows-2019-Qt-5.15.2-shared-ON (push) Has been cancelled
CMake / windows-2019-Qt-6.4.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.7.0-shared-ON (push) Has been cancelled
- (stringToStyleEnum) not working properly (contribution by @samapico)
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
# Changes
|
# Changes
|
||||||
|
|
||||||
|
- (2025-07-15) #66, Style name parsing (stringToStyleEnum) not working properly (contribution by @samapico)
|
||||||
- (2025-05-08) #65, Support for Qt 6.9. Fix the CMakelist example
|
- (2025-05-08) #65, Support for Qt 6.9. Fix the CMakelist example
|
||||||
- (2025-04-07) Update to 6.7.2 (Updated OTF files)
|
- (2025-04-07) Update to 6.7.2 (Updated OTF files)
|
||||||
- (2024-11-21) Update to 6.7.1, Extra Duotone styles
|
- (2024-11-21) Update to 6.7.1, Extra Duotone styles
|
||||||
|
|||||||
@@ -462,7 +462,7 @@ QIcon QtAwesome::icon(const QString& name, const QVariantMap& options)
|
|||||||
|
|
||||||
if( spaceIndex > 0) {
|
if( spaceIndex > 0) {
|
||||||
QString styleName = name.left(spaceIndex);
|
QString styleName = name.left(spaceIndex);
|
||||||
style = stringToStyleEnum(styleName.startsWith("fa-") ? styleName.mid(3) : name);
|
style = stringToStyleEnum(styleName.startsWith("fa-") ? styleName : "fa-" + styleName);
|
||||||
iconName = name.mid(spaceIndex + 1);
|
iconName = name.mid(spaceIndex + 1);
|
||||||
} else {
|
} else {
|
||||||
iconName = name;
|
iconName = name;
|
||||||
|
|||||||
Reference in New Issue
Block a user