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/settings.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/settings.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/settings.ui.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/tools/uic/baseline/settings.ui.h b/tests/auto/tools/uic/baseline/settings.ui.h index aa03609e98..7342810462 100644 --- a/tests/auto/tools/uic/baseline/settings.ui.h +++ b/tests/auto/tools/uic/baseline/settings.ui.h @@ -185,13 +185,13 @@ public: void retranslateUi(QDialog *Dialog) { - Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", 0)); - label->setText(QApplication::translate("Dialog", "Audio device:", 0)); - label_6->setText(QApplication::translate("Dialog", "Audio effect:", 0)); - crossFadeLabel->setText(QApplication::translate("Dialog", "Cross fade:", 0)); - label_3->setText(QApplication::translate("Dialog", "-10 Sec", 0)); - label_5->setText(QApplication::translate("Dialog", "0", 0)); - label_4->setText(QApplication::translate("Dialog", "10 Sec", 0)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", Q_NULLPTR)); + label->setText(QApplication::translate("Dialog", "Audio device:", Q_NULLPTR)); + label_6->setText(QApplication::translate("Dialog", "Audio effect:", Q_NULLPTR)); + crossFadeLabel->setText(QApplication::translate("Dialog", "Cross fade:", Q_NULLPTR)); + label_3->setText(QApplication::translate("Dialog", "-10 Sec", Q_NULLPTR)); + label_5->setText(QApplication::translate("Dialog", "0", Q_NULLPTR)); + label_4->setText(QApplication::translate("Dialog", "10 Sec", Q_NULLPTR)); } // retranslateUi }; |