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

 Conflicts:
	src/corelib/kernel/qmetatype.cpp

Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a

3 files changed, 14 insertions, 16 deletions

diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index b68bed436e..10d5fd4f95 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -137,11 +137,8 @@ win32:SOURCES += ../../corelib/global/qoperatingsystemversion_win.cpp \
 mac {
     SOURCES += \
         ../../corelib/kernel/qcoreapplication_mac.cpp \
-        ../../corelib/kernel/qcore_mac.cpp
-
-    OBJECTIVE_SOURCES += \
+        ../../corelib/kernel/qcore_mac.mm \
         ../../corelib/global/qoperatingsystemversion_darwin.mm \
-        ../../corelib/kernel/qcore_mac_objc.mm \
         ../../corelib/kernel/qcore_foundation.mm
 
     LIBS += -framework Foundation
diff --git a/src/tools/qlalr/doc/src/qlalr.qdoc b/src/tools/qlalr/doc/src/qlalr.qdoc
index 74eed82e89..bed6268071 100644
--- a/src/tools/qlalr/doc/src/qlalr.qdoc
+++ b/src/tools/qlalr/doc/src/qlalr.qdoc
@@ -53,7 +53,6 @@
     \page qlalr-files.html
     \title qlalr - Writing Grammars
 
-    \contentspage qlalr
     \previouspage qlalr
     \nextpage qlalr - Generating Code from Grammar Specifications
 
@@ -63,7 +62,6 @@
     \page qlalr-generating.html
     \title qlalr - Generating Code from Grammar Specifications
 
-    \contentspage qlalr
     \previouspage qlalr - Writing Grammars
     \nextpage qlalr - qlalr Grammar Specification
 */
@@ -72,7 +70,6 @@
     \page qlalr-grammar-specification.html
     \title qlalr - qlalr Grammar Specification
 
-    \contentspage qlalr
     \previouspage qlalr - Generating Code from Grammar Specifications
     \nextpage qlalr - Handling Conflicts
 
@@ -82,7 +79,6 @@
     \page qlalr-handling-conflicts.html
     \title qlalr - Handling Conflicts
 
-    \contentspage qlalr
     \previouspage qlalr - qlalr Grammar Specification
     \nextpage qlalr - Error Handling and Recovery
 */
@@ -91,7 +87,6 @@
     \page qlalr-handling-errors.html
     \title qlalr - Error Handling and Recovery
 
-    \contentspage qlalr
     \previouspage qlalr - Handling Conflicts
     \nextpage qlalr - References to External Information
 */
@@ -100,7 +95,6 @@
     \page qlalr-external-references.html
     \title qlalr - References to External Information
 
-    \contentspage qlalr
     \previouspage qlalr - Error Handling and Recovery
 */
 
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