From fdef9c80391c23875208d8576096c0d5366fedc4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 27 Jun 2019 15:07:01 +0200 Subject: uic: Implement form window setting to disable QObject::connectSlotsByName() Task-number: QTBUG-76375 Change-Id: I16ad147366aa7d52b7a0e17ae240127d8ac34b3c Reviewed-by: Jarek Kobus --- src/tools/uic/cpp/cppwriteinitialization.cpp | 5 ++++- src/tools/uic/cpp/cppwriteinitialization.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/tools/uic/cpp') diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 4185d3ba70..d16c859eed 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -467,6 +467,9 @@ void WriteInitialization::acceptUI(DomUI *node) m_widgetChain.push(nullptr); m_layoutChain.push(nullptr); + if (node->hasAttributeConnectslotsbyname()) + m_connectSlotsByName = node->attributeConnectslotsbyname(); + acceptLayoutDefault(node->elementLayoutDefault()); acceptLayoutFunction(node->elementLayoutFunction()); @@ -536,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 a28dfc1b25..6f8e352f6a 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -311,6 +311,7 @@ private: bool m_layoutWidget = false; bool m_firstThemeIcon = true; + bool m_connectSlotsByName = true; }; } // namespace CPP -- cgit v1.2.3