feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Change-Id: I552d201d09d62d21655176467088c6e48b8a2fe2
This commit is contained in:
Eike Ziller
2022-06-29 15:29:49 +02:00
parent 75b5d1baf1 56faa204bd
commit 6c98721efc
99 changed files with 1318 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljseditingsettingspage.cpp
View File

@@ -169,7 +169,7 @@ public:
m_ui.autoFormatOnSave->setChecked(s.autoFormatOnSave());
m_ui.autoFormatOnlyCurrentProject->setChecked(s.autoFormatOnlyCurrentProject());
m_ui.foldAuxDataCheckBox->setChecked(s.foldAuxData());
m_ui.uiQmlOpenComboBox->addItem(tr("Always ask"), "");
m_ui.uiQmlOpenComboBox->addItem(tr("Always Ask"), "");
m_ui.uiQmlOpenComboBox->addItem(tr("Qt Design Studio"), Core::Constants::MODE_DESIGN);
m_ui.uiQmlOpenComboBox->addItem(tr("Qt Creator"), Core::Constants::MODE_EDIT);
int comboIndex = m_ui.uiQmlOpenComboBox->findData(s.uiQmlOpenMode());