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/wateringconfigdialog.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/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 705c7bb142..348a83a8da 100644 --- a/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h +++ b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h @@ -243,38 +243,38 @@ public: void retranslateUi(QDialog *WateringConfigDialog) { - WateringConfigDialog->setWindowTitle(QApplication::translate("WateringConfigDialog", "Watering Configuration", 0)); - label_3->setText(QApplication::translate("WateringConfigDialog", "Plant:", 0)); + WateringConfigDialog->setWindowTitle(QApplication::translate("WateringConfigDialog", "Watering Configuration", Q_NULLPTR)); + label_3->setText(QApplication::translate("WateringConfigDialog", "Plant:", Q_NULLPTR)); plantComboBox->clear(); plantComboBox->insertItems(0, QStringList() - << 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) + << QApplication::translate("WateringConfigDialog", "Squash", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Bean", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Carrot", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Strawberry", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Raspberry", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Blueberry", Q_NULLPTR) ); - label_2->setText(QApplication::translate("WateringConfigDialog", "Water when:", 0)); - temperatureCheckBox->setText(QApplication::translate("WateringConfigDialog", "Temperature is higher than:", 0)); + label_2->setText(QApplication::translate("WateringConfigDialog", "Water when:", Q_NULLPTR)); + temperatureCheckBox->setText(QApplication::translate("WateringConfigDialog", "Temperature is higher than:", Q_NULLPTR)); temperatureSpinBox->setSpecialValueText(QString()); - temperatureSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "C", 0)); - rainCheckBox->setText(QApplication::translate("WateringConfigDialog", "Rain less than:", 0)); + temperatureSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "C", Q_NULLPTR)); + rainCheckBox->setText(QApplication::translate("WateringConfigDialog", "Rain less than:", Q_NULLPTR)); rainSpinBox->setSpecialValueText(QString()); - 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)); + rainSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "mm", Q_NULLPTR)); + label->setText(QApplication::translate("WateringConfigDialog", "Starting Time:", Q_NULLPTR)); + label_4->setText(QApplication::translate("WateringConfigDialog", "Amount:", Q_NULLPTR)); + amountSpinBox->setSuffix(QApplication::translate("WateringConfigDialog", "l", Q_NULLPTR)); + label_5->setText(QApplication::translate("WateringConfigDialog", "Source:", Q_NULLPTR)); sourceComboBox->clear(); sourceComboBox->insertItems(0, QStringList() - << QApplication::translate("WateringConfigDialog", "Foundain", 0) - << QApplication::translate("WateringConfigDialog", "River", 0) - << QApplication::translate("WateringConfigDialog", "Lake", 0) - << QApplication::translate("WateringConfigDialog", "Public Water System", 0) + << QApplication::translate("WateringConfigDialog", "Foundain", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "River", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Lake", Q_NULLPTR) + << QApplication::translate("WateringConfigDialog", "Public Water System", Q_NULLPTR) ); - label_6->setText(QApplication::translate("WateringConfigDialog", "Filter:", 0)); + label_6->setText(QApplication::translate("WateringConfigDialog", "Filter:", Q_NULLPTR)); filterCheckBox->setText(QString()); - helpLabel->setText(QApplication::translate("WateringConfigDialog", "<a href=\"test\">Show Details</a>", 0)); + helpLabel->setText(QApplication::translate("WateringConfigDialog", "<a href=\"test\">Show Details</a>", Q_NULLPTR)); } // retranslateUi }; |