diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-05-17 02:37:23 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-18 22:38:55 +0200 |
commit | 7968543bb0308395226a8847274dc3b836dd7b87 (patch) | |
tree | 9e449b49d0e2f271bdad50008954d735711a1606 /tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h | |
parent | 8df298665a1e637ab6d26d5fcc447d5502afe31a (diff) |
Don't use the deprecated translate() method anymore
The Encoding argument of QCoreApplication::translate()
is deprecated and source code is always assumed to be
encoded in Utf8. Simply remove the encoding argument
from the generated .ui.h files.
Change-Id: If6c40f6df13abd45a0303c863077972c3d1fb685
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h index f03ac32151..1bb8b8f837 100644 --- a/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h +++ b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h @@ -244,38 +244,38 @@ public: void retranslateUi(QDialog *WateringConfigDialog) { - WateringConfigDialog->setWindowTitle(QApplication::translate("WateringConfigDialog", "Watering Configuration", 0, QApplication::UnicodeUTF8)); - label_3->setText(QApplication::translate("WateringConfigDialog", "Plant:", 0, QApplication::UnicodeUTF8)); + WateringConfigDialog->setWindowTitle(QApplication::translate("WateringConfigDialog", "Watering Configuration", 0)); + label_3->setText(QApplication::translate("WateringConfigDialog", "Plant:", 0)); plantComboBox->clear(); plantComboBox->insertItems(0, QStringList() - << QApplication::translate("WateringConfigDialog", "Squash", 0, QApplication::UnicodeUTF8) - << QApplication::translate("WateringConfigDialog", "Bean", 0, QApplication::UnicodeUTF8) - << QApplication::translate("WateringConfigDialog", "Carrot", 0, QApplication::UnicodeUTF8) - << QApplication::translate("WateringConfigDialog", "Strawberry", 0, QApplication::UnicodeUTF8) - << QApplication::translate("WateringConfigDialog", "Raspberry", 0, QApplication::UnicodeUTF8) - << QApplication::translate("WateringConfigDialog", "Blueberry", 0, QApplication::UnicodeUTF8) + << QApplication::translate("WateringConfigDialog", "Squash", 0) + << QApplication::translate("WateringConfigDialog", "Bean", 0) + << QApplication::translate("WateringConfigDialog", "Carrot", 0) + << QApplication::translate("WateringConfigDialog", "Strawberry", 0) + << QApplication::translate("WateringConfigDialog", "Raspberry", 0) + << QApplication::translate("WateringConfigDialog", "Blueberry", 0) ); - label_2->setText(QApplication::translate("WateringConfigDialog", "Water when:", 0, QApplication::UnicodeUTF8)); - temperatureCheckBox->setText(QApplication::translate("WateringConfigDialog", "Temperature is higher than:", 0, QApplication::UnicodeUTF8)); + label_2->setText(QApplication::translate("WateringConfigDialog", "Water when:", 0)); + temperatureCheckBox->setText(QApplication::translate("WateringConfigDialog", "Temperature is higher than:", 0)); temperatureSpinBox->setSpecialValueText(QString()); - temperatureSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "C", 0, QApplication::UnicodeUTF8)); - rainCheckBox->setText(QApplication::translate("WateringConfigDialog", "Rain less than:", 0, QApplication::UnicodeUTF8)); + temperatureSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "C", 0)); + rainCheckBox->setText(QApplication::translate("WateringConfigDialog", "Rain less than:", 0)); rainSpinBox->setSpecialValueText(QString()); - rainSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "mm", 0, QApplication::UnicodeUTF8)); - label->setText(QApplication::translate("WateringConfigDialog", "Starting Time:", 0, QApplication::UnicodeUTF8)); - label_4->setText(QApplication::translate("WateringConfigDialog", "Amount:", 0, QApplication::UnicodeUTF8)); - amountSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "l", 0, QApplication::UnicodeUTF8)); - label_5->setText(QApplication::translate("WateringConfigDialog", "Source:", 0, QApplication::UnicodeUTF8)); + rainSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "mm", 0)); + label->setText(QApplication::translate("WateringConfigDialog", "Starting Time:", 0)); + label_4->setText(QApplication::translate("WateringConfigDialog", "Amount:", 0)); + amountSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "l", 0)); + label_5->setText(QApplication::translate("WateringConfigDialog", "Source:", 0)); sourceComboBox->clear(); sourceComboBox->insertItems(0, QStringList() - << QApplication::translate("WateringConfigDialog", "Foundain", 0, QApplication::UnicodeUTF8) - << QApplication::translate("WateringConfigDialog", "River", 0, QApplication::UnicodeUTF8) - << QApplication::translate("WateringConfigDialog", "Lake", 0, QApplication::UnicodeUTF8) - << QApplication::translate("WateringConfigDialog", "Public Water System", 0, QApplication::UnicodeUTF8) + << QApplication::translate("WateringConfigDialog", "Foundain", 0) + << QApplication::translate("WateringConfigDialog", "River", 0) + << QApplication::translate("WateringConfigDialog", "Lake", 0) + << QApplication::translate("WateringConfigDialog", "Public Water System", 0) ); - label_6->setText(QApplication::translate("WateringConfigDialog", "Filter:", 0, QApplication::UnicodeUTF8)); + label_6->setText(QApplication::translate("WateringConfigDialog", "Filter:", 0)); filterCheckBox->setText(QString()); - helpLabel->setText(QApplication::translate("WateringConfigDialog", "<a href=\"test\">Show Details</a>", 0, QApplication::UnicodeUTF8)); + helpLabel->setText(QApplication::translate("WateringConfigDialog", "<a href=\"test\">Show Details</a>", 0)); } // retranslateUi }; |