diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-08-28 17:42:50 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-08-28 15:25:07 +0000 |
commit | d61e61fa1a98fca48e35338a5672f586a1d31143 (patch) | |
tree | 1bf9550aec2da3705a7ad6e8f83b857e28cec8af /tests/auto/tools/uic/baseline/imagedialog.ui.h | |
parent | eeaaac8f0e18680f80a142492675fa90a743f4ec (diff) |
uic: Use nullptr instead of Q_NULLPTR in generated code
nullptr can be used directly in the Qt code since Qt 5.7.
Use it in generated code for consistency.
Change-Id: I249aeaf0a39b46ce1106b29d3ea4569a399908b7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'tests/auto/tools/uic/baseline/imagedialog.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/imagedialog.ui.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/tools/uic/baseline/imagedialog.ui.h b/tests/auto/tools/uic/baseline/imagedialog.ui.h index 9ce2a577f0..2b55d1f0ab 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", 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)); + dialog->setWindowTitle(QApplication::translate("ImageDialog", "Create Image", nullptr)); + widthLabel->setText(QApplication::translate("ImageDialog", "Width:", nullptr)); + heightLabel->setText(QApplication::translate("ImageDialog", "Height:", nullptr)); + nameLineEdit->setText(QApplication::translate("ImageDialog", "Untitled image", nullptr)); + nameLabel->setText(QApplication::translate("ImageDialog", "Name:", nullptr)); + colorDepthLabel->setText(QApplication::translate("ImageDialog", "Color depth:", nullptr)); + okButton->setText(QApplication::translate("ImageDialog", "OK", nullptr)); + cancelButton->setText(QApplication::translate("ImageDialog", "Cancel", nullptr)); } // retranslateUi }; |