From b2ebc64dd9914359fe8acf2bc9960e341e98cf80 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 30 Apr 2021 11:31:33 +0200
Subject: uic: Fix font family code generation for python

Amend the code introduced by d8602ce58b6ef268be84b9aa0166b0c3fa6a96e8
to generator correct code for Python.

Pick-to: 6.1 dev
Change-Id: I71fc9a1830d6bd591d32ce08002572c29f02a27f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/tools/uic/cpp/cppwriteinitialization.cpp | 6 ++++--
 src/tools/uic/shared/language.cpp            | 6 ++++++
 src/tools/uic/shared/language.h              | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 534a78791d..9471fd22d9 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -1624,8 +1624,10 @@ QString WriteInitialization::writeFontProperties(const DomFont *f)
     m_output << m_indent << language::stackVariable("QFont", fontName)
         << language::eol;
     if (f->hasElementFamily() && !f->elementFamily().isEmpty()) {
-        m_output << m_indent << fontName << ".setFamilies(QStringList{"
-            << language::qstring(f->elementFamily(), m_dindent) << "})" << language::eol;
+        m_output << m_indent << fontName << ".setFamilies("
+            << language::listStart
+            << language::qstring(f->elementFamily(), m_dindent)
+            << language::listEnd << ')' << language::eol;
     }
     if (f->hasElementPointSize() && f->elementPointSize() > 0) {
          m_output << m_indent << fontName << ".setPointSize(" << f->elementPointSize()
diff --git a/src/tools/uic/shared/language.cpp b/src/tools/uic/shared/language.cpp
index 48f5830760..2f2ae3ebc6 100644
--- a/src/tools/uic/shared/language.cpp
+++ b/src/tools/uic/shared/language.cpp
@@ -43,6 +43,8 @@ void setLanguage(Language l)
     switch (_language) {
     case Language::Cpp:
         derefPointer = QLatin1String("->");
+        listStart = '{';
+        listEnd = '}';
         nullPtr = QLatin1String("nullptr");
         operatorNew = QLatin1String("new ");
         qtQualifier = QLatin1String("Qt::");
@@ -54,6 +56,8 @@ void setLanguage(Language l)
         break;
     case Language::Python:
         derefPointer = QLatin1String(".");
+        listStart = '[';
+        listEnd = ']';
         nullPtr = QLatin1String("None");
         operatorNew = QLatin1String("");
         qtQualifier = QLatin1String("Qt.");
@@ -67,6 +71,8 @@ void setLanguage(Language l)
 }
 
 QString derefPointer;
+char listStart;
+char listEnd;
 QString nullPtr;
 QString operatorNew;
 QString qtQualifier;
diff --git a/src/tools/uic/shared/language.h b/src/tools/uic/shared/language.h
index fcc2d5d258..918f25e46a 100644
--- a/src/tools/uic/shared/language.h
+++ b/src/tools/uic/shared/language.h
@@ -48,6 +48,8 @@ ConnectionSyntax connectionSyntax();
 void setConnectionSyntax(ConnectionSyntax cs);
 
 extern QString derefPointer;
+extern char listStart;
+extern char listEnd;
 extern QString nullPtr;
 extern QString operatorNew;
 extern QString qtQualifier;
-- 
cgit v1.2.3