games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Launcher: Qt6 support. Qt 5.12 required (#746)

Browse Source 
* Launcher: Qt6 support. Qt 5.12 required
This commit is contained in:
Konstantin
2022-05-28 16:32:20 +03:00
committed by GitHub
parent 9d06e51631
commit 1a6ee0d697
8 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/jsonutils.cpp
View File

@@ -106,9 +106,9 @@ JsonNode toJson(QVariant object)
ret.Struct() = VariantToMap(object.toMap());
else if(object.canConvert<QVariantList>())
ret.Vector() = VariantToList(object.toList());
else if(static_cast<QMetaType::Type>(object.type()) == QMetaType::QString)
else if(object.userType() == QMetaType::QString)
ret.String() = object.toString().toUtf8().data();
else if(static_cast<QMetaType::Type>(object.type()) == QMetaType::Bool)
else if(object.userType() == QMetaType::Bool)
ret.Bool() = object.toBool();
else if(object.canConvert<double>())
ret.Float() = object.toFloat();