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/tabbedbrowser.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/tabbedbrowser.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/tabbedbrowser.ui.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h index acf0ddaef4..869e33c3aa 100644 --- a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h +++ b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h @@ -183,14 +183,14 @@ public: void retranslateUi(QWidget *TabbedBrowser) { - TabbedBrowser->setWindowTitle(QApplication::translate("TabbedBrowser", "TabbedBrowser", Q_NULLPTR)); - tab->setTabText(tab->indexOf(frontpage), QApplication::translate("TabbedBrowser", "Untitled", Q_NULLPTR)); + TabbedBrowser->setWindowTitle(QApplication::translate("TabbedBrowser", "TabbedBrowser", nullptr)); + tab->setTabText(tab->indexOf(frontpage), QApplication::translate("TabbedBrowser", "Untitled", nullptr)); toolClose->setText(QString()); - toolPrevious->setText(QApplication::translate("TabbedBrowser", "Previous", Q_NULLPTR)); - toolNext->setText(QApplication::translate("TabbedBrowser", "Next", Q_NULLPTR)); - checkCase->setText(QApplication::translate("TabbedBrowser", "Case Sensitive", Q_NULLPTR)); - checkWholeWords->setText(QApplication::translate("TabbedBrowser", "Whole words", Q_NULLPTR)); - labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/qt-project.org/assistant/images/wrap.png\"> Search wrapped", Q_NULLPTR)); + toolPrevious->setText(QApplication::translate("TabbedBrowser", "Previous", nullptr)); + toolNext->setText(QApplication::translate("TabbedBrowser", "Next", nullptr)); + checkCase->setText(QApplication::translate("TabbedBrowser", "Case Sensitive", nullptr)); + checkWholeWords->setText(QApplication::translate("TabbedBrowser", "Whole words", nullptr)); + labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/qt-project.org/assistant/images/wrap.png\"> Search wrapped", nullptr)); } // retranslateUi }; |