4 files changed, 16 insertions, 17 deletions
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index 0ba49627c0..71e02ae9c9 100644
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -69,7 +69,7 @@ static inline QString moduleHeader(const QString &module, const QString &header)
 namespace CPP {
 
 WriteIncludes::WriteIncludes(Uic *uic)
-    : m_uic(uic), m_output(uic->output()), m_laidOut(false)
+    : m_uic(uic), m_output(uic->output())
 {
     // When possible (no namespace) use the "QtModule/QClass" convention
     // and create a re-mapping of the old header "qclass.h" to it. Do not do this
diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h
index aadc6f54fc..9b9ac283fe 100644
--- a/src/tools/uic/cpp/cppwriteincludes.h
+++ b/src/tools/uic/cpp/cppwriteincludes.h
@@ -101,7 +101,7 @@ private:
     StringMap m_classToHeader;
     StringMap m_oldHeaderToNewHeader;
 
-    bool m_laidOut;
+    bool m_laidOut = false;
 };
 
 } // namespace CPP
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 85b9a9f60b..d16c859eed 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -455,22 +455,20 @@ WriteInitialization::WriteInitialization(Uic *uic) :
       m_driver(uic->driver()), m_output(uic->output()), m_option(uic->option()),
       m_indent(m_option.indent + m_option.indent),
       m_dindent(m_indent + m_option.indent),
-      m_stdsetdef(true),
-      m_layoutMarginType(TopLevelMargin),
-      m_mainFormUsedInRetranslateUi(false),
       m_delayedOut(&m_delayedInitialization, QIODevice::WriteOnly),
       m_refreshOut(&m_refreshInitialization, QIODevice::WriteOnly),
-      m_actionOut(&m_delayedActionInitialization, QIODevice::WriteOnly),
-      m_layoutWidget(false),
-      m_firstThemeIcon(true)
+      m_actionOut(&m_delayedActionInitialization, QIODevice::WriteOnly)
 {
 }
 
 void WriteInitialization::acceptUI(DomUI *node)
 {
-    m_actionGroupChain.push(0);
-    m_widgetChain.push(0);
-    m_layoutChain.push(0);
+    m_actionGroupChain.push(nullptr);
+    m_widgetChain.push(nullptr);
+    m_layoutChain.push(nullptr);
+
+    if (node->hasAttributeConnectslotsbyname())
+        m_connectSlotsByName = node->attributeConnectslotsbyname();
 
     acceptLayoutDefault(node->elementLayoutDefault());
     acceptLayoutFunction(node->elementLayoutFunction());
@@ -541,7 +539,7 @@ void WriteInitialization::acceptUI(DomUI *node)
     if (!m_delayedInitialization.isEmpty())
         m_output << "\n" << m_delayedInitialization << "\n";
 
-    if (m_option.autoConnection) {
+    if (m_option.autoConnection && m_connectSlotsByName) {
         m_output << "\n" << m_indent << "QMetaObject" << language::qualifier
             << "connectSlotsByName(" << varName << ')' << language::eol;
     }
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
index 3cd0efeaac..6f8e352f6a 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -244,7 +244,7 @@ private:
     const Option &m_option;
     QString m_indent;
     QString m_dindent;
-    bool m_stdsetdef;
+    bool m_stdsetdef = true;
 
     struct Buddy
     {
@@ -294,11 +294,11 @@ private:
 
     // layout defaults
     LayoutDefaultHandler m_LayoutDefaultHandler;
-    int m_layoutMarginType;
+    int m_layoutMarginType = TopLevelMargin;
 
     QString m_generatedClass;
     QString m_mainFormVarName;
-    bool m_mainFormUsedInRetranslateUi;
+    bool m_mainFormUsedInRetranslateUi = false;
 
     QString m_delayedInitialization;
     QTextStream m_delayedOut;
@@ -309,8 +309,9 @@ private:
     QString m_delayedActionInitialization;
     QTextStream m_actionOut;
 
-    bool m_layoutWidget;
-    bool m_firstThemeIcon;
+    bool m_layoutWidget = false;
+    bool m_firstThemeIcon = true;
+    bool m_connectSlotsByName = true;
 };
 
 } // namespace CPP