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/preferencesdialog.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/preferencesdialog.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/preferencesdialog.ui.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/tools/uic/baseline/preferencesdialog.ui.h b/tests/auto/tools/uic/baseline/preferencesdialog.ui.h index 2c4d08c547..078d13a7f5 100644 --- a/tests/auto/tools/uic/baseline/preferencesdialog.ui.h +++ b/tests/auto/tools/uic/baseline/preferencesdialog.ui.h @@ -153,11 +153,11 @@ public: void retranslateUi(QDialog *PreferencesDialog) { - PreferencesDialog->setWindowTitle(QApplication::translate("PreferencesDialog", "Preferences", 0)); - m_uiModeGroupBox->setTitle(QApplication::translate("PreferencesDialog", "User Interface Mode", 0)); - m_templatePathGroupBox->setTitle(QApplication::translate("PreferencesDialog", "Additional Template Paths", 0)); - m_addTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", 0)); - m_removeTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", 0)); + PreferencesDialog->setWindowTitle(QApplication::translate("PreferencesDialog", "Preferences", Q_NULLPTR)); + m_uiModeGroupBox->setTitle(QApplication::translate("PreferencesDialog", "User Interface Mode", Q_NULLPTR)); + m_templatePathGroupBox->setTitle(QApplication::translate("PreferencesDialog", "Additional Template Paths", Q_NULLPTR)); + m_addTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", Q_NULLPTR)); + m_removeTemplatePathButton->setText(QApplication::translate("PreferencesDialog", "...", Q_NULLPTR)); } // retranslateUi }; |