diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-05 06:39:30 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 13:57:12 +0200 |
commit | 657c2bfbeceda3faa2c7a76b4ccec6a65a3445a2 (patch) | |
tree | 83e0a1dab04afb291e181bb8fb6152ba96678795 /tests/auto/tools/uic/baseline/browserwidget.ui.h | |
parent | 676129d7ee57347798683d444823e7723776d8ec (diff) | |
parent | b94111116f09a6e48741d35cf7abea47af99ef26 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/testlib/selftests/generate_expected_output.py
Change-Id: If856162abf9a24ae2c9946d336a7d1da03520fa7
Diffstat (limited to 'tests/auto/tools/uic/baseline/browserwidget.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/browserwidget.ui.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/tools/uic/baseline/browserwidget.ui.h b/tests/auto/tools/uic/baseline/browserwidget.ui.h index aa0e6786a0..876e99d504 100644 --- a/tests/auto/tools/uic/baseline/browserwidget.ui.h +++ b/tests/auto/tools/uic/baseline/browserwidget.ui.h @@ -156,18 +156,18 @@ public: void retranslateUi(QWidget *Browser) { - Browser->setWindowTitle(QApplication::translate("Browser", "Qt SQL Browser", 0)); - insertRowAction->setText(QApplication::translate("Browser", "&Insert Row", 0)); + Browser->setWindowTitle(QApplication::translate("Browser", "Qt SQL Browser", Q_NULLPTR)); + insertRowAction->setText(QApplication::translate("Browser", "&Insert Row", Q_NULLPTR)); #ifndef QT_NO_STATUSTIP - insertRowAction->setStatusTip(QApplication::translate("Browser", "Inserts a new Row", 0)); + insertRowAction->setStatusTip(QApplication::translate("Browser", "Inserts a new Row", Q_NULLPTR)); #endif // QT_NO_STATUSTIP - deleteRowAction->setText(QApplication::translate("Browser", "&Delete Row", 0)); + deleteRowAction->setText(QApplication::translate("Browser", "&Delete Row", Q_NULLPTR)); #ifndef QT_NO_STATUSTIP - deleteRowAction->setStatusTip(QApplication::translate("Browser", "Deletes the current Row", 0)); + deleteRowAction->setStatusTip(QApplication::translate("Browser", "Deletes the current Row", Q_NULLPTR)); #endif // QT_NO_STATUSTIP - groupBox->setTitle(QApplication::translate("Browser", "SQL Query", 0)); - clearButton->setText(QApplication::translate("Browser", "&Clear", 0)); - submitButton->setText(QApplication::translate("Browser", "&Submit", 0)); + groupBox->setTitle(QApplication::translate("Browser", "SQL Query", Q_NULLPTR)); + clearButton->setText(QApplication::translate("Browser", "&Clear", Q_NULLPTR)); + submitButton->setText(QApplication::translate("Browser", "&Submit", Q_NULLPTR)); } // retranslateUi }; |