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/embeddeddialog.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/embeddeddialog.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/embeddeddialog.ui.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/tools/uic/baseline/embeddeddialog.ui.h b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h index 446c5d54ff..554c5d754c 100644 --- a/tests/auto/tools/uic/baseline/embeddeddialog.ui.h +++ b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h @@ -100,14 +100,14 @@ public: void retranslateUi(QDialog *embeddedDialog) { - embeddedDialog->setWindowTitle(QApplication::translate("embeddedDialog", "Embedded Dialog", Q_NULLPTR)); - label->setText(QApplication::translate("embeddedDialog", "Layout Direction:", Q_NULLPTR)); - layoutDirection->setItemText(0, QApplication::translate("embeddedDialog", "Left to Right", Q_NULLPTR)); - layoutDirection->setItemText(1, QApplication::translate("embeddedDialog", "Right to Left", Q_NULLPTR)); - - label_2->setText(QApplication::translate("embeddedDialog", "Select Font:", Q_NULLPTR)); - label_3->setText(QApplication::translate("embeddedDialog", "Style:", Q_NULLPTR)); - label_4->setText(QApplication::translate("embeddedDialog", "Layout spacing:", Q_NULLPTR)); + embeddedDialog->setWindowTitle(QApplication::translate("embeddedDialog", "Embedded Dialog", nullptr)); + label->setText(QApplication::translate("embeddedDialog", "Layout Direction:", nullptr)); + layoutDirection->setItemText(0, QApplication::translate("embeddedDialog", "Left to Right", nullptr)); + layoutDirection->setItemText(1, QApplication::translate("embeddedDialog", "Right to Left", nullptr)); + + label_2->setText(QApplication::translate("embeddedDialog", "Select Font:", nullptr)); + label_3->setText(QApplication::translate("embeddedDialog", "Style:", nullptr)); + label_4->setText(QApplication::translate("embeddedDialog", "Layout spacing:", nullptr)); } // retranslateUi }; |