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/Widget.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/Widget.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/Widget.ui.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/tools/uic/baseline/Widget.ui.h b/tests/auto/tools/uic/baseline/Widget.ui.h index b5bb974423..b812386645 100644 --- a/tests/auto/tools/uic/baseline/Widget.ui.h +++ b/tests/auto/tools/uic/baseline/Widget.ui.h @@ -60,13 +60,13 @@ public: void retranslateUi(QWidget *Form) { - Form->setWindowTitle(QApplication::translate("Form", "Form", 0)); + Form->setWindowTitle(QApplication::translate("Form", "Form", Q_NULLPTR)); Alabel->setText(QApplication::translate("Form", "A label.\n" "One new line.\n" "Another new line.\n" -"Last line.", 0)); - groupBox->setTitle(QApplication::translate("Form", "A Group Box", 0)); - pushButton->setText(QApplication::translate("Form", "PushButton", 0)); +"Last line.", Q_NULLPTR)); + groupBox->setTitle(QApplication::translate("Form", "A Group Box", Q_NULLPTR)); + pushButton->setText(QApplication::translate("Form", "PushButton", Q_NULLPTR)); } // retranslateUi }; |