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/orderdialog.ui.h | |
| parent | b5d471d0c23128528a0aa33ed5172bb1bab05bb1 (diff) | |
| parent | 4fa90c1757c15425d5e0df1a4f5dbc7e77c265f8 (diff) | |
Merge dev into 5.10
Change-Id: I5fb5e7e6e57bb5db6fcb1f670f7f6cbc8def2d60
Diffstat (limited to 'tests/auto/tools/uic/baseline/orderdialog.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/orderdialog.ui.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/tools/uic/baseline/orderdialog.ui.h b/tests/auto/tools/uic/baseline/orderdialog.ui.h index 483db65de2..eb1f90d23b 100644 --- a/tests/auto/tools/uic/baseline/orderdialog.ui.h +++ b/tests/auto/tools/uic/baseline/orderdialog.ui.h @@ -133,13 +133,13 @@ public: void retranslateUi(QDialog *qdesigner_internal__OrderDialog) { - qdesigner_internal__OrderDialog->setWindowTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Change Page Order", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Page Order", Q_NULLPTR)); + qdesigner_internal__OrderDialog->setWindowTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Change Page Order", nullptr)); + groupBox->setTitle(QApplication::translate("qdesigner_internal::OrderDialog", "Page Order", nullptr)); #ifndef QT_NO_TOOLTIP - upButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page up", Q_NULLPTR)); + upButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page up", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - downButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page down", Q_NULLPTR)); + downButton->setToolTip(QApplication::translate("qdesigner_internal::OrderDialog", "Move page down", nullptr)); #endif // QT_NO_TOOLTIP } // retranslateUi |