From 816a6238761810c28a991a959ea61a834de2a2a5 Mon Sep 17 00:00:00 2001 From: Dyami Caliri Date: Tue, 16 Aug 2016 20:52:14 -0700 Subject: uic: generate translate calls with Q_NULLPTR instead of 0 uic should use Q_NULLPTR instead of 0 as the default disambiguation context. Task-number: QTBUG-45291 Change-Id: I889182c7fe1c4be3336f3cd645aa60838863c633 Reviewed-by: Marc Mutz --- tests/auto/tools/uic/baseline/imagedialog.ui.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/auto/tools/uic/baseline/imagedialog.ui.h') diff --git a/tests/auto/tools/uic/baseline/imagedialog.ui.h b/tests/auto/tools/uic/baseline/imagedialog.ui.h index 99e853b7a8..9ce2a577f0 100644 --- a/tests/auto/tools/uic/baseline/imagedialog.ui.h +++ b/tests/auto/tools/uic/baseline/imagedialog.ui.h @@ -199,14 +199,14 @@ public: void retranslateUi(QDialog *dialog) { - dialog->setWindowTitle(QApplication::translate("ImageDialog", "Create Image", 0)); - widthLabel->setText(QApplication::translate("ImageDialog", "Width:", 0)); - heightLabel->setText(QApplication::translate("ImageDialog", "Height:", 0)); - nameLineEdit->setText(QApplication::translate("ImageDialog", "Untitled image", 0)); - nameLabel->setText(QApplication::translate("ImageDialog", "Name:", 0)); - colorDepthLabel->setText(QApplication::translate("ImageDialog", "Color depth:", 0)); - okButton->setText(QApplication::translate("ImageDialog", "OK", 0)); - cancelButton->setText(QApplication::translate("ImageDialog", "Cancel", 0)); + dialog->setWindowTitle(QApplication::translate("ImageDialog", "Create Image", Q_NULLPTR)); + widthLabel->setText(QApplication::translate("ImageDialog", "Width:", Q_NULLPTR)); + heightLabel->setText(QApplication::translate("ImageDialog", "Height:", Q_NULLPTR)); + nameLineEdit->setText(QApplication::translate("ImageDialog", "Untitled image", Q_NULLPTR)); + nameLabel->setText(QApplication::translate("ImageDialog", "Name:", Q_NULLPTR)); + colorDepthLabel->setText(QApplication::translate("ImageDialog", "Color depth:", Q_NULLPTR)); + okButton->setText(QApplication::translate("ImageDialog", "OK", Q_NULLPTR)); + cancelButton->setText(QApplication::translate("ImageDialog", "Cancel", Q_NULLPTR)); } // retranslateUi }; -- cgit v1.2.3