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/stylesheeteditor.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/stylesheeteditor.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/stylesheeteditor.ui.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h b/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h index 35b45f7e94..94ffa45509 100644 --- a/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h @@ -130,16 +130,16 @@ public: void retranslateUi(QWidget *StyleSheetEditor) { - StyleSheetEditor->setWindowTitle(QApplication::translate("StyleSheetEditor", "Style Editor", 0)); + StyleSheetEditor->setWindowTitle(QApplication::translate("StyleSheetEditor", "Style Editor", Q_NULLPTR)); styleSheetCombo->clear(); styleSheetCombo->insertItems(0, QStringList() - << QApplication::translate("StyleSheetEditor", "Default", 0) - << QApplication::translate("StyleSheetEditor", "Coffee", 0) - << QApplication::translate("StyleSheetEditor", "Pagefold", 0) + << QApplication::translate("StyleSheetEditor", "Default", Q_NULLPTR) + << QApplication::translate("StyleSheetEditor", "Coffee", Q_NULLPTR) + << QApplication::translate("StyleSheetEditor", "Pagefold", Q_NULLPTR) ); - label_7->setText(QApplication::translate("StyleSheetEditor", "Style:", 0)); - applyButton->setText(QApplication::translate("StyleSheetEditor", "&Apply", 0)); - label_8->setText(QApplication::translate("StyleSheetEditor", "Style Sheet:", 0)); + label_7->setText(QApplication::translate("StyleSheetEditor", "Style:", Q_NULLPTR)); + applyButton->setText(QApplication::translate("StyleSheetEditor", "&Apply", Q_NULLPTR)); + label_8->setText(QApplication::translate("StyleSheetEditor", "Style Sheet:", Q_NULLPTR)); } // retranslateUi }; |