diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-19 11:23:55 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-04 08:12:33 +0200 |
commit | da3cb1deb6c752f8e4c05434e3451432e5d787ba (patch) | |
tree | c2f7992eeee39617102cb864f798ebd7c06ec5f0 /tests/auto/tools/uic/baseline/treewidgeteditor.ui.h | |
parent | 8231614661e1eecaabcf33d1e332809556e86089 (diff) |
uic: Generate Qt 5 connection syntax
Add a enum and formatting for member function pointer based
connections. Now preferably use member function pointer for Qt classes
or parameterless connections.
This should not require qOverload() within Qt classes after the
Signal/Slot disambiguation.
Add command line option to force either syntax for all connections.
Task-number: QTBUG-76375
Change-Id: Icdb4051e1173172a71cd536bdbc7d1ab1edf267d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/tools/uic/baseline/treewidgeteditor.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/treewidgeteditor.ui.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h index c7840ce6df..335279860a 100644 --- a/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h @@ -40,6 +40,7 @@ #define TREEWIDGETEDITOR_H #include <QtCore/QVariant> +#include <QtWidgets/QAbstractButton> #include <QtWidgets/QApplication> #include <QtWidgets/QDialog> #include <QtWidgets/QDialogButtonBox> @@ -268,8 +269,8 @@ public: QWidget::setTabOrder(moveColumnUpButton, moveColumnDownButton); retranslateUi(qdesigner_internal__TreeWidgetEditor); - QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__TreeWidgetEditor, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__TreeWidgetEditor, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, qdesigner_internal__TreeWidgetEditor, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, qdesigner_internal__TreeWidgetEditor, &QDialog::reject); QMetaObject::connectSlotsByName(qdesigner_internal__TreeWidgetEditor); } // setupUi |