From ae7e701074be97130aa45f780e2456981850b432 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 5 May 2020 07:56:29 +0200 Subject: uic: Generate string-based connections for custom slots Qt Designer let's you add custom slots and signals to the main form; they should use string-based connection syntax since the class is not known in setupUI(). Amends da3cb1deb6c752f8e4c05434e3451432e5d787ba. Task-number: QTBUG-76375 Change-Id: I5a3a5630f77c812d48db1cdb7a8658a4d2718228 Reviewed-by: Liang Qi --- src/tools/uic/cpp/cppwriteinitialization.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/tools/uic/cpp/cppwriteinitialization.h') diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index df06358077e..ed8f29d15cb 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -38,6 +38,7 @@ #include enum class ConnectionSyntax; +namespace language { struct SignalSlot; } QT_BEGIN_NAMESPACE @@ -241,9 +242,8 @@ private: void addButtonGroup(const DomWidget *node, const QString &varName); void addWizardPage(const QString &pageVarName, const DomWidget *page, const QString &parentWidget); bool isCustomWidget(const QString &className) const; - ConnectionSyntax connectionSyntax(const QString &senderSignature, - const QString &senderClassName, - const QString &receiverClassName) const; + ConnectionSyntax connectionSyntax(const language::SignalSlot &sender, + const language::SignalSlot &receiver) const; const Uic *m_uic; Driver *m_driver; @@ -305,6 +305,8 @@ private: QString m_generatedClass; QString m_mainFormVarName; + QStringList m_customSlots; + QStringList m_customSignals; bool m_mainFormUsedInRetranslateUi = false; QString m_delayedInitialization; -- cgit v1.2.3