Merge dev into 5.10

Change-Id: I5fb5e7e6e57bb5db6fcb1f670f7f6cbc8def2d60

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\">&nbsp;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\">&nbsp;Search wrapped", nullptr));
     } // retranslateUi
 
 };