summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/uic/baseline/dialog.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/dialog.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/dialog.ui.h')
-rw-r--r--tests/auto/tools/uic/baseline/dialog.ui.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/tools/uic/baseline/dialog.ui.h b/tests/auto/tools/uic/baseline/dialog.ui.h
index 88ca359e20..afcb9f2f8b 100644
--- a/tests/auto/tools/uic/baseline/dialog.ui.h
+++ b/tests/auto/tools/uic/baseline/dialog.ui.h
@@ -61,10 +61,10 @@ public:
void retranslateUi(QDialog *Dialog)
{
- Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_NULLPTR));
- loadFromFileButton->setText(QApplication::translate("Dialog", "Load Image From File...", Q_NULLPTR));
- label->setText(QApplication::translate("Dialog", "Launch two of these dialogs. In the first, press the top button and load an image from a file. In the second, press the bottom button and display the loaded image from shared memory.", Q_NULLPTR));
- loadFromSharedMemoryButton->setText(QApplication::translate("Dialog", "Display Image From Shared Memory", Q_NULLPTR));
+ Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", nullptr));
+ loadFromFileButton->setText(QApplication::translate("Dialog", "Load Image From File...", nullptr));
+ label->setText(QApplication::translate("Dialog", "Launch two of these dialogs. In the first, press the top button and load an image from a file. In the second, press the bottom button and display the loaded image from shared memory.", nullptr));
+ loadFromSharedMemoryButton->setText(QApplication::translate("Dialog", "Display Image From Shared Memory", nullptr));
} // retranslateUi
};