From d61e61fa1a98fca48e35338a5672f586a1d31143 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Mon, 28 Aug 2017 17:42:50 +0300 Subject: 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 --- tests/auto/tools/uic/baseline/topicchooser.ui.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/tools/uic/baseline/topicchooser.ui.h') diff --git a/tests/auto/tools/uic/baseline/topicchooser.ui.h b/tests/auto/tools/uic/baseline/topicchooser.ui.h index 5580b437da..9a30232ff7 100644 --- a/tests/auto/tools/uic/baseline/topicchooser.ui.h +++ b/tests/auto/tools/uic/baseline/topicchooser.ui.h @@ -103,10 +103,10 @@ public: void retranslateUi(QDialog *TopicChooser) { - TopicChooser->setWindowTitle(QApplication::translate("TopicChooser", "Choose Topic", Q_NULLPTR)); - label->setText(QApplication::translate("TopicChooser", "&Topics", Q_NULLPTR)); - buttonDisplay->setText(QApplication::translate("TopicChooser", "&Display", Q_NULLPTR)); - buttonCancel->setText(QApplication::translate("TopicChooser", "&Close", Q_NULLPTR)); + TopicChooser->setWindowTitle(QApplication::translate("TopicChooser", "Choose Topic", nullptr)); + label->setText(QApplication::translate("TopicChooser", "&Topics", nullptr)); + buttonDisplay->setText(QApplication::translate("TopicChooser", "&Display", nullptr)); + buttonCancel->setText(QApplication::translate("TopicChooser", "&Close", nullptr)); } // retranslateUi }; -- cgit v1.2.3