summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/uic/baseline/qtresourceeditordialog.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/qtresourceeditordialog.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/qtresourceeditordialog.ui.h')
-rw-r--r--tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h
index 50c844cf35..604cbdaf9d 100644
--- a/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h
@@ -143,25 +143,25 @@ public:
void retranslateUi(QDialog *QtResourceEditorDialog)
{
- QtResourceEditorDialog->setWindowTitle(QApplication::translate("QtResourceEditorDialog", "Dialog", Q_NULLPTR));
+ QtResourceEditorDialog->setWindowTitle(QApplication::translate("QtResourceEditorDialog", "Dialog", nullptr));
#ifndef QT_NO_TOOLTIP
- newQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New File", Q_NULLPTR));
+ newQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New File", nullptr));
#endif // QT_NO_TOOLTIP
- newQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "N", Q_NULLPTR));
+ newQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "N", nullptr));
#ifndef QT_NO_TOOLTIP
- removeQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove File", Q_NULLPTR));
+ removeQrcButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove File", nullptr));
#endif // QT_NO_TOOLTIP
- removeQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "R", Q_NULLPTR));
- importQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "I", Q_NULLPTR));
+ removeQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "R", nullptr));
+ importQrcButton->setText(QApplication::translate("QtResourceEditorDialog", "I", nullptr));
#ifndef QT_NO_TOOLTIP
- newResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New Resource", Q_NULLPTR));
+ newResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "New Resource", nullptr));
#endif // QT_NO_TOOLTIP
- newResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "N", Q_NULLPTR));
- addResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "A", Q_NULLPTR));
+ newResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "N", nullptr));
+ addResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "A", nullptr));
#ifndef QT_NO_TOOLTIP
- removeResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove Resource or File", Q_NULLPTR));
+ removeResourceButton->setToolTip(QApplication::translate("QtResourceEditorDialog", "Remove Resource or File", nullptr));
#endif // QT_NO_TOOLTIP
- removeResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "R", Q_NULLPTR));
+ removeResourceButton->setText(QApplication::translate("QtResourceEditorDialog", "R", nullptr));
} // retranslateUi
};