Fixed Json conversion on Qt6

ChangeLog.md

@@ -2,6 +2,8 @@
 
 ### GENERAL:
 * Fixed movement cost penalty from terrain
+* Fixed blocked progress in Launcher on language detection failure
+* Launcher will now correctly handle selection of Data directory in H3 install
 
 # 1.1.1 -> 1.2.0
 

launcher/firstLaunch/firstlaunch_moc.cpp

@@ -190,7 +190,7 @@ void FirstLaunchView::heroesDataMissing()
 	ui->labelDataCopy->setVisible(true);
 
 	ui->labelDataFound->setVisible(false);
-	ui->pushButtonDataNext->setEnabled(true);
+	ui->pushButtonDataNext->setEnabled(false);
 
 	if(hasVCMIBuilderScript)
 	{

launcher/jsonutils.cpp

@@ -96,14 +96,14 @@ JsonNode toJson(QVariant object)
 {
 	JsonNode ret;
 
-	if(object.canConvert<QVariantMap>())
-		ret.Struct() = VariantToMap(object.toMap());
-	else if(object.canConvert<QVariantList>())
-		ret.Vector() = VariantToList(object.toList());
-	else if(object.userType() == QMetaType::QString)
+	if(object.userType() == QMetaType::QString)
 		ret.String() = object.toString().toUtf8().data();
 	else if(object.userType() == QMetaType::Bool)
 		ret.Bool() = object.toBool();
+	else if(object.canConvert<QVariantMap>())
+		ret.Struct() = VariantToMap(object.toMap());
+	else if(object.canConvert<QVariantList>())
+		ret.Vector() = VariantToList(object.toList());
 	else if(object.canConvert<int>())
 		ret.Integer() = object.toInt();
 	else if(object.canConvert<double>())