1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uic: Fix font family code generation for python

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

Change-Id: I71fc9a1830d6bd591d32ce08002572c29f02a27f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit b2ebc64dd9914359fe8acf2bc9960e341e98cf80)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2021-04-30 11:31:33 +02:00 committed by Qt Cherry-pick Bot
parent aca924f32c
commit e6b1d28b57
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -1624,8 +1624,10 @@ QString WriteInitialization::writeFontProperties(const DomFont *f)
m_output << m_indent << language::stackVariable("QFont", fontName) m_output << m_indent << language::stackVariable("QFont", fontName)
<< language::eol; << language::eol;
if (f->hasElementFamily() && !f->elementFamily().isEmpty()) { if (f->hasElementFamily() && !f->elementFamily().isEmpty()) {
m_output << m_indent << fontName << ".setFamilies(QStringList{" m_output << m_indent << fontName << ".setFamilies("
<< language::qstring(f->elementFamily(), m_dindent) << "})" << language::eol; << language::listStart
<< language::qstring(f->elementFamily(), m_dindent)
<< language::listEnd << ')' << language::eol;
} }
if (f->hasElementPointSize() && f->elementPointSize() > 0) { if (f->hasElementPointSize() && f->elementPointSize() > 0) {
m_output << m_indent << fontName << ".setPointSize(" << f->elementPointSize() m_output << m_indent << fontName << ".setPointSize(" << f->elementPointSize()

6
src/tools/uic/shared/language.cpp
View File

@ -43,6 +43,8 @@ void setLanguage(Language l)
switch (_language) { switch (_language) {
case Language::Cpp: case Language::Cpp:
derefPointer = QLatin1String("->"); derefPointer = QLatin1String("->");
listStart = '{';
listEnd = '}';
nullPtr = QLatin1String("nullptr"); nullPtr = QLatin1String("nullptr");
operatorNew = QLatin1String("new "); operatorNew = QLatin1String("new ");
qtQualifier = QLatin1String("Qt::"); qtQualifier = QLatin1String("Qt::");
@ -54,6 +56,8 @@ void setLanguage(Language l)
break; break;
case Language::Python: case Language::Python:
derefPointer = QLatin1String("."); derefPointer = QLatin1String(".");
listStart = '[';
listEnd = ']';
nullPtr = QLatin1String("None"); nullPtr = QLatin1String("None");
operatorNew = QLatin1String(""); operatorNew = QLatin1String("");
qtQualifier = QLatin1String("Qt."); qtQualifier = QLatin1String("Qt.");
@ -67,6 +71,8 @@ void setLanguage(Language l)
} }
QString derefPointer; QString derefPointer;
char listStart;
char listEnd;
QString nullPtr; QString nullPtr;
QString operatorNew; QString operatorNew;
QString qtQualifier; QString qtQualifier;

2
src/tools/uic/shared/language.h
View File

@ -48,6 +48,8 @@ ConnectionSyntax connectionSyntax();
void setConnectionSyntax(ConnectionSyntax cs); void setConnectionSyntax(ConnectionSyntax cs);
extern QString derefPointer; extern QString derefPointer;
extern char listStart;
extern char listEnd;
extern QString nullPtr; extern QString nullPtr;
extern QString operatorNew; extern QString operatorNew;
extern QString qtQualifier; extern QString qtQualifier;