diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-05 07:56:29 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-05 15:35:51 +0200 |
| commit | ae7e701074be97130aa45f780e2456981850b432 (patch) | |
| tree | 1b29ce93065c41d235e719c0b254a34844f6d0e8 /src/tools/uic/cpp/cppwriteinitialization.h | |
| parent | ca33e7a7406f2301883e0f6fdc382e8f8aa58b94 (diff) | |
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 <liang.qi@qt.io>
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.h')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.h | 8 |
1 files changed, 5 insertions, 3 deletions
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 <qtextstream.h> 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; |