From 3f7d087d3394a0cd80042f50edd9abcc53febe18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristi=C3=A1n=20Maureira-Fredes?=
<cristian.maureira-fredes@qt.io>
Date: Fri, 28 Feb 2020 10:42:47 +0100
Subject: uic: Add pass to empty functions
When there are no translations on the UI file,
the function was left empty but without a 'pass'
statement, generating a SyntaxError,
this change includes it to avoid problems while
using the generated Python file.
Fixes: PYSIDE-1234
Change-Id: I30482a95c95fb4b4f4456531946a79c960d76318
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
src/tools/uic/cpp/cppwriteinitialization.cpp | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
(limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 1212c410ff0..92fd6471a8e 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -546,12 +546,19 @@ void WriteInitialization::acceptUI(DomUI *node)
m_output << m_option.indent << language::endFunctionDefinition("setupUi");
- if (!m_mainFormUsedInRetranslateUi && language::language() == Language::Cpp) {
- // Mark varName as unused to avoid compiler warnings.
- m_refreshInitialization += m_indent;
- m_refreshInitialization += QLatin1String("(void)");
- m_refreshInitialization += varName ;
- m_refreshInitialization += language::eol;
+ if (!m_mainFormUsedInRetranslateUi) {
+ if (language::language() == Language::Cpp) {
+ // Mark varName as unused to avoid compiler warnings.
+ m_refreshInitialization += m_indent;
+ m_refreshInitialization += QLatin1String("(void)");
+ m_refreshInitialization += varName ;
+ m_refreshInitialization += language::eol;
+ } else if (language::language() == Language::Python) {
+ // output a 'pass' to have an empty function
+ m_refreshInitialization += m_indent;
+ m_refreshInitialization += QLatin1String("pass");
+ m_refreshInitialization += language::eol;
+ }
}
m_output << m_option.indent
--
cgit v1.2.3