From 816a6238761810c28a991a959ea61a834de2a2a5 Mon Sep 17 00:00:00 2001 From: Dyami Caliri Date: Tue, 16 Aug 2016 20:52:14 -0700 Subject: uic: generate translate calls with Q_NULLPTR instead of 0 uic should use Q_NULLPTR instead of 0 as the default disambiguation context. Task-number: QTBUG-45291 Change-Id: I889182c7fe1c4be3336f3cd645aa60838863c633 Reviewed-by: Marc Mutz --- tests/auto/tools/uic/baseline/tetrixwindow.ui.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/auto/tools/uic/baseline/tetrixwindow.ui.h') diff --git a/tests/auto/tools/uic/baseline/tetrixwindow.ui.h b/tests/auto/tools/uic/baseline/tetrixwindow.ui.h index 0f945fab35..f3ec6d6fc9 100644 --- a/tests/auto/tools/uic/baseline/tetrixwindow.ui.h +++ b/tests/auto/tools/uic/baseline/tetrixwindow.ui.h @@ -150,15 +150,15 @@ public: void retranslateUi(QWidget *TetrixWindow) { - TetrixWindow->setWindowTitle(QApplication::translate("TetrixWindow", "Tetrix", 0)); - startButton->setText(QApplication::translate("TetrixWindow", "&Start", 0)); - linesRemovedLabel->setText(QApplication::translate("TetrixWindow", "LINES REMOVED", 0)); - pauseButton->setText(QApplication::translate("TetrixWindow", "&Pause", 0)); - levelLabel->setText(QApplication::translate("TetrixWindow", "LEVEL", 0)); - nextLabel->setText(QApplication::translate("TetrixWindow", "NEXT", 0)); - scoreLabel->setText(QApplication::translate("TetrixWindow", "SCORE", 0)); + TetrixWindow->setWindowTitle(QApplication::translate("TetrixWindow", "Tetrix", Q_NULLPTR)); + startButton->setText(QApplication::translate("TetrixWindow", "&Start", Q_NULLPTR)); + linesRemovedLabel->setText(QApplication::translate("TetrixWindow", "LINES REMOVED", Q_NULLPTR)); + pauseButton->setText(QApplication::translate("TetrixWindow", "&Pause", Q_NULLPTR)); + levelLabel->setText(QApplication::translate("TetrixWindow", "LEVEL", Q_NULLPTR)); + nextLabel->setText(QApplication::translate("TetrixWindow", "NEXT", Q_NULLPTR)); + scoreLabel->setText(QApplication::translate("TetrixWindow", "SCORE", Q_NULLPTR)); nextPieceLabel->setText(QString()); - quitButton->setText(QApplication::translate("TetrixWindow", "&Quit", 0)); + quitButton->setText(QApplication::translate("TetrixWindow", "&Quit", Q_NULLPTR)); } // retranslateUi }; -- cgit v1.2.3