merge fixes2

This commit is contained in:
xueyan hu
2021-12-23 17:15:49 +08:00
parent b90485ab59
commit f748ce7185
5 changed files with 8 additions and 11 deletions

View File

@@ -27,7 +27,7 @@ GUIFormBaseDialog::GUIFormBaseDialog(QWidget* parent, Qt::WindowFlags f) : QDial
btnCancel->setText(tr("Cancel"));
hLayout->addWidget(btnOk);
hLayout->addWidget(btnCancel);
btnOk->setObjectName(tr("btnOK"));
btnOk->setObjectName("btnOK");
connect(btnOk, &QPushButton::clicked, [t = this]() {
if (t->updateReferenceData())
t->accept();