summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/uic/baseline/Widget.ui.h
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2017-08-28 17:42:50 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2017-08-28 15:25:07 +0000
commitd61e61fa1a98fca48e35338a5672f586a1d31143 (patch)
tree1bf9550aec2da3705a7ad6e8f83b857e28cec8af /tests/auto/tools/uic/baseline/Widget.ui.h
parenteeaaac8f0e18680f80a142492675fa90a743f4ec (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/Widget.ui.h')
-rw-r--r--tests/auto/tools/uic/baseline/Widget.ui.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/tools/uic/baseline/Widget.ui.h b/tests/auto/tools/uic/baseline/Widget.ui.h
index b812386645..4705159fea 100644
--- a/tests/auto/tools/uic/baseline/Widget.ui.h
+++ b/tests/auto/tools/uic/baseline/Widget.ui.h
@@ -60,13 +60,13 @@ public:
void retranslateUi(QWidget *Form)
{
- Form->setWindowTitle(QApplication::translate("Form", "Form", Q_NULLPTR));
+ Form->setWindowTitle(QApplication::translate("Form", "Form", nullptr));
Alabel->setText(QApplication::translate("Form", "A label.\n"
"One new line.\n"
"Another new line.\n"
-"Last line.", Q_NULLPTR));
- groupBox->setTitle(QApplication::translate("Form", "A Group Box", Q_NULLPTR));
- pushButton->setText(QApplication::translate("Form", "PushButton", Q_NULLPTR));
+"Last line.", nullptr));
+ groupBox->setTitle(QApplication::translate("Form", "A Group Box", nullptr));
+ pushButton->setText(QApplication::translate("Form", "PushButton", nullptr));
} // retranslateUi
};