diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-05 18:47:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 18:47:27 +0200 |
| commit | d892e6f721b0163dfb2f2ecf79d80ba62304a542 (patch) | |
| tree | ccc1de7ece77bca11b20b3335126c337720d5e54 /tests/auto/tools/uic/baseline/filterpage.ui.h | |
| parent | 2997a60e1eaf0efbeb22516ae184fa93f278fec5 (diff) | |
| parent | 657c2bfbeceda3faa2c7a76b4ccec6a65a3445a2 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/features/qt_common.prf
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
Change-Id: I03b92b6b89ecc5a8db7c95f04ebb92ed198098a8
Diffstat (limited to 'tests/auto/tools/uic/baseline/filterpage.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/filterpage.ui.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/tools/uic/baseline/filterpage.ui.h b/tests/auto/tools/uic/baseline/filterpage.ui.h index fb12686a83..d2e37dc5a4 100644 --- a/tests/auto/tools/uic/baseline/filterpage.ui.h +++ b/tests/auto/tools/uic/baseline/filterpage.ui.h @@ -105,14 +105,14 @@ public: void retranslateUi(QWidget *FilterPage) { - FilterPage->setWindowTitle(QApplication::translate("FilterPage", "Form", 0)); - label->setText(QApplication::translate("FilterPage", "Filter attributes for current documentation (comma separated list):", 0)); - groupBox->setTitle(QApplication::translate("FilterPage", "Custom Filters", 0)); + FilterPage->setWindowTitle(QApplication::translate("FilterPage", "Form", Q_NULLPTR)); + label->setText(QApplication::translate("FilterPage", "Filter attributes for current documentation (comma separated list):", Q_NULLPTR)); + groupBox->setTitle(QApplication::translate("FilterPage", "Custom Filters", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem = customFilterWidget->headerItem(); - ___qtreewidgetitem->setText(1, QApplication::translate("FilterPage", "2", 0)); - ___qtreewidgetitem->setText(0, QApplication::translate("FilterPage", "1", 0)); - addButton->setText(QApplication::translate("FilterPage", "Add", 0)); - removeButton->setText(QApplication::translate("FilterPage", "Remove", 0)); + ___qtreewidgetitem->setText(1, QApplication::translate("FilterPage", "2", Q_NULLPTR)); + ___qtreewidgetitem->setText(0, QApplication::translate("FilterPage", "1", Q_NULLPTR)); + addButton->setText(QApplication::translate("FilterPage", "Add", Q_NULLPTR)); + removeButton->setText(QApplication::translate("FilterPage", "Remove", Q_NULLPTR)); } // retranslateUi }; |