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/gridpanel.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/gridpanel.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/gridpanel.ui.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/tools/uic/baseline/gridpanel.ui.h b/tests/auto/tools/uic/baseline/gridpanel.ui.h index c289914aaf..2c61c7228b 100644 --- a/tests/auto/tools/uic/baseline/gridpanel.ui.h +++ b/tests/auto/tools/uic/baseline/gridpanel.ui.h @@ -135,14 +135,14 @@ public: void retranslateUi(QWidget *qdesigner_internal__GridPanel) { - qdesigner_internal__GridPanel->setWindowTitle(QApplication::translate("qdesigner_internal::GridPanel", "Form", 0)); - m_gridGroupBox->setTitle(QApplication::translate("qdesigner_internal::GridPanel", "Grid", 0)); - m_visibleCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Visible", 0)); - label->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &X", 0)); - m_snapXCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", 0)); - m_resetButton->setText(QApplication::translate("qdesigner_internal::GridPanel", "Reset", 0)); - label_2->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &Y", 0)); - m_snapYCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", 0)); + qdesigner_internal__GridPanel->setWindowTitle(QApplication::translate("qdesigner_internal::GridPanel", "Form", Q_NULLPTR)); + m_gridGroupBox->setTitle(QApplication::translate("qdesigner_internal::GridPanel", "Grid", Q_NULLPTR)); + m_visibleCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Visible", Q_NULLPTR)); + label->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &X", Q_NULLPTR)); + m_snapXCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", Q_NULLPTR)); + m_resetButton->setText(QApplication::translate("qdesigner_internal::GridPanel", "Reset", Q_NULLPTR)); + label_2->setText(QApplication::translate("qdesigner_internal::GridPanel", "Grid &Y", Q_NULLPTR)); + m_snapYCheckBox->setText(QApplication::translate("qdesigner_internal::GridPanel", "Snap", Q_NULLPTR)); } // retranslateUi }; |