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/formwindowsettings.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/formwindowsettings.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/formwindowsettings.ui.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h index 2aafa8b6c0..77d0109548 100644 --- a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h +++ b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h @@ -274,17 +274,17 @@ public: void retranslateUi(QDialog *FormWindowSettings) { - FormWindowSettings->setWindowTitle(QApplication::translate("FormWindowSettings", "Form Settings", Q_NULLPTR)); - layoutDefaultGroupBox->setTitle(QApplication::translate("FormWindowSettings", "Layout &Default", Q_NULLPTR)); - label_2->setText(QApplication::translate("FormWindowSettings", "&Spacing:", Q_NULLPTR)); - label->setText(QApplication::translate("FormWindowSettings", "&Margin:", Q_NULLPTR)); - layoutFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Layout Function", Q_NULLPTR)); - label_3->setText(QApplication::translate("FormWindowSettings", "Ma&rgin:", Q_NULLPTR)); - label_3_2->setText(QApplication::translate("FormWindowSettings", "Spa&cing:", Q_NULLPTR)); - pixmapFunctionGroupBox_2->setTitle(QApplication::translate("FormWindowSettings", "&Author", Q_NULLPTR)); - includeHintsGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Include Hints", Q_NULLPTR)); - pixmapFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Pixmap Function", Q_NULLPTR)); - gridPanel->setTitle(QApplication::translate("FormWindowSettings", "Grid", Q_NULLPTR)); + FormWindowSettings->setWindowTitle(QApplication::translate("FormWindowSettings", "Form Settings", nullptr)); + layoutDefaultGroupBox->setTitle(QApplication::translate("FormWindowSettings", "Layout &Default", nullptr)); + label_2->setText(QApplication::translate("FormWindowSettings", "&Spacing:", nullptr)); + label->setText(QApplication::translate("FormWindowSettings", "&Margin:", nullptr)); + layoutFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Layout Function", nullptr)); + label_3->setText(QApplication::translate("FormWindowSettings", "Ma&rgin:", nullptr)); + label_3_2->setText(QApplication::translate("FormWindowSettings", "Spa&cing:", nullptr)); + pixmapFunctionGroupBox_2->setTitle(QApplication::translate("FormWindowSettings", "&Author", nullptr)); + includeHintsGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Include Hints", nullptr)); + pixmapFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Pixmap Function", nullptr)); + gridPanel->setTitle(QApplication::translate("FormWindowSettings", "Grid", nullptr)); } // retranslateUi }; |