diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:08 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:09 +0200 |
commit | 9831118378c5d489f76089011277a1b7234a8d68 (patch) | |
tree | a67e82fde179fa727172fff9098758d60912189d /tests/auto/tools/uic/baseline/connectdialog.ui.h | |
parent | b5d471d0c23128528a0aa33ed5172bb1bab05bb1 (diff) | |
parent | 4fa90c1757c15425d5e0df1a4f5dbc7e77c265f8 (diff) |
Merge dev into 5.10
Change-Id: I5fb5e7e6e57bb5db6fcb1f670f7f6cbc8def2d60
Diffstat (limited to 'tests/auto/tools/uic/baseline/connectdialog.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/connectdialog.ui.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/tools/uic/baseline/connectdialog.ui.h b/tests/auto/tools/uic/baseline/connectdialog.ui.h index 384f406582..fde460c483 100644 --- a/tests/auto/tools/uic/baseline/connectdialog.ui.h +++ b/tests/auto/tools/uic/baseline/connectdialog.ui.h @@ -129,12 +129,12 @@ public: void retranslateUi(QDialog *ConnectDialog) { - ConnectDialog->setWindowTitle(QApplication::translate("ConnectDialog", "Configure Connection", Q_NULLPTR)); - signalGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", Q_NULLPTR)); - editSignalsButton->setText(QApplication::translate("ConnectDialog", "Edit...", Q_NULLPTR)); - slotGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", Q_NULLPTR)); - editSlotsButton->setText(QApplication::translate("ConnectDialog", "Edit...", Q_NULLPTR)); - showAllCheckBox->setText(QApplication::translate("ConnectDialog", "Show signals and slots inherited from QWidget", Q_NULLPTR)); + ConnectDialog->setWindowTitle(QApplication::translate("ConnectDialog", "Configure Connection", nullptr)); + signalGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", nullptr)); + editSignalsButton->setText(QApplication::translate("ConnectDialog", "Edit...", nullptr)); + slotGroupBox->setTitle(QApplication::translate("ConnectDialog", "GroupBox", nullptr)); + editSlotsButton->setText(QApplication::translate("ConnectDialog", "Edit...", nullptr)); + showAllCheckBox->setText(QApplication::translate("ConnectDialog", "Show signals and slots inherited from QWidget", nullptr)); } // retranslateUi }; |