diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
| commit | 40a1f69e8663fb79560c26cfad5ead45b1b3ee5f (patch) | |
| tree | a8ceb093a098a38b29c0fe27e41af480ae10b876 /tests/auto/tools/uic/baseline/installdialog.ui.h | |
| parent | 446afc10451d5097d7bd20b1b8d20325c4d54fa5 (diff) | |
| parent | 6b2071c697d4c48f0cd289b28b443ebffc3432e6 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure.json
mkspecs/macx-tvos-clang/qmake.conf
mkspecs/macx-watchos-clang/qmake.conf
Change-Id: Iaf32339ace59dff9ed344972472744c55d75025c
Diffstat (limited to 'tests/auto/tools/uic/baseline/installdialog.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/installdialog.ui.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/tools/uic/baseline/installdialog.ui.h b/tests/auto/tools/uic/baseline/installdialog.ui.h index 6ba51c7404..5bbd7b6f08 100644 --- a/tests/auto/tools/uic/baseline/installdialog.ui.h +++ b/tests/auto/tools/uic/baseline/installdialog.ui.h @@ -123,13 +123,13 @@ public: void retranslateUi(QDialog *InstallDialog) { - InstallDialog->setWindowTitle(QApplication::translate("InstallDialog", "Install Documentation", 0)); - label->setText(QApplication::translate("InstallDialog", "Available Documentation:", 0)); - installButton->setText(QApplication::translate("InstallDialog", "Install", 0)); - cancelButton->setText(QApplication::translate("InstallDialog", "Cancel", 0)); - closeButton->setText(QApplication::translate("InstallDialog", "Close", 0)); - label_4->setText(QApplication::translate("InstallDialog", "Installation Path:", 0)); - browseButton->setText(QApplication::translate("InstallDialog", "...", 0)); + InstallDialog->setWindowTitle(QApplication::translate("InstallDialog", "Install Documentation", Q_NULLPTR)); + label->setText(QApplication::translate("InstallDialog", "Available Documentation:", Q_NULLPTR)); + installButton->setText(QApplication::translate("InstallDialog", "Install", Q_NULLPTR)); + cancelButton->setText(QApplication::translate("InstallDialog", "Cancel", Q_NULLPTR)); + closeButton->setText(QApplication::translate("InstallDialog", "Close", Q_NULLPTR)); + label_4->setText(QApplication::translate("InstallDialog", "Installation Path:", Q_NULLPTR)); + browseButton->setText(QApplication::translate("InstallDialog", "...", Q_NULLPTR)); } // retranslateUi }; |