diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-06 06:56:27 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-09-06 06:56:27 +0000 |
| commit | 23ef3b04ebfc0c7a87800b4ff09444c854e31fdb (patch) | |
| tree | 5a3509a5de492bf13e8f9dfb96b0cbaaa72dc6d0 /tests/auto/tools/uic/baseline/chatdialog.ui.h | |
| parent | beaa792e2021aad52ecd98a0e0f0f48571069dba (diff) | |
| parent | d892e6f721b0163dfb2f2ecf79d80ba62304a542 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'tests/auto/tools/uic/baseline/chatdialog.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/chatdialog.ui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/tools/uic/baseline/chatdialog.ui.h b/tests/auto/tools/uic/baseline/chatdialog.ui.h index e917eb9fb1..b678b85eb9 100644 --- a/tests/auto/tools/uic/baseline/chatdialog.ui.h +++ b/tests/auto/tools/uic/baseline/chatdialog.ui.h @@ -100,8 +100,8 @@ public: void retranslateUi(QDialog *ChatDialog) { - ChatDialog->setWindowTitle(QApplication::translate("ChatDialog", "Chat", 0)); - label->setText(QApplication::translate("ChatDialog", "Message:", 0)); + ChatDialog->setWindowTitle(QApplication::translate("ChatDialog", "Chat", Q_NULLPTR)); + label->setText(QApplication::translate("ChatDialog", "Message:", Q_NULLPTR)); } // retranslateUi }; |