Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/corelib/kernel/qmetatype.cpp

Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a

1 files changed, 13 insertions, 6 deletions

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 58ed210d3b..2a9efaac95 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