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

QmlJSEditor: Fix order of initialization

Browse Source 
Enabler need to get set after reading the settings.
Silences soft asserts.

Change-Id: I7e70279537a87462e607e51a40d9fef565b46fa8
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2024-07-11 07:21:40 +02:00
parent 88d31a6f0e
commit 04bb6b95fe
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmljseditor/qmljseditorsettings.cpp
View File

@@ -214,7 +214,6 @@ QmlJsEditingSettings::QmlJsEditingSettings()
autoFormatOnSave.setLabelText(Tr::tr("Enable auto format on file save")); autoFormatOnSave.setLabelText(Tr::tr("Enable auto format on file save"));
autoFormatOnlyCurrentProject.setSettingsKey(group, AUTO_FORMAT_ONLY_CURRENT_PROJECT); autoFormatOnlyCurrentProject.setSettingsKey(group, AUTO_FORMAT_ONLY_CURRENT_PROJECT);
autoFormatOnlyCurrentProject.setEnabler(&autoFormatOnSave);
autoFormatOnlyCurrentProject.setLabelText( autoFormatOnlyCurrentProject.setLabelText(
Tr::tr("Restrict to files contained in the current project")); Tr::tr("Restrict to files contained in the current project"));
@@ -231,22 +230,18 @@ QmlJsEditingSettings::QmlJsEditingSettings()
uiQmlOpenMode.addOption({Tr::tr("Qt Creator"), {}, Core::Constants::MODE_EDIT}); uiQmlOpenMode.addOption({Tr::tr("Qt Creator"), {}, Core::Constants::MODE_EDIT});
useLatestQmlls.setSettingsKey(group, USE_LATEST_QMLLS); useLatestQmlls.setSettingsKey(group, USE_LATEST_QMLLS);
useLatestQmlls.setEnabler(&useQmlls);
useLatestQmlls.setLabelText(Tr::tr("Use from latest Qt version")); useLatestQmlls.setLabelText(Tr::tr("Use from latest Qt version"));
disableBuiltinCodemodel.setSettingsKey(group, DISABLE_BUILTIN_CODEMODEL); disableBuiltinCodemodel.setSettingsKey(group, DISABLE_BUILTIN_CODEMODEL);
disableBuiltinCodemodel.setEnabler(&useQmlls);
disableBuiltinCodemodel.setLabelText( disableBuiltinCodemodel.setLabelText(
Tr::tr("Use advanced features (renaming, find usages, and so on) " Tr::tr("Use advanced features (renaming, find usages, and so on) "
"(experimental)")); "(experimental)"));
generateQmllsIniFiles.setSettingsKey(group, GENERATE_QMLLS_INI_FILES); generateQmllsIniFiles.setSettingsKey(group, GENERATE_QMLLS_INI_FILES);
generateQmllsIniFiles.setEnabler(&useQmlls);
generateQmllsIniFiles.setLabelText( generateQmllsIniFiles.setLabelText(
Tr::tr("Create .qmlls.ini files for new projects")); Tr::tr("Create .qmlls.ini files for new projects"));
ignoreMinimumQmllsVersion.setSettingsKey(group, IGNORE_MINIMUM_QMLLS_VERSION); ignoreMinimumQmllsVersion.setSettingsKey(group, IGNORE_MINIMUM_QMLLS_VERSION);
ignoreMinimumQmllsVersion.setEnabler(&useQmlls);
ignoreMinimumQmllsVersion.setLabelText( ignoreMinimumQmllsVersion.setLabelText(
Tr::tr("Allow versions below Qt %1") Tr::tr("Allow versions below Qt %1")
.arg(QmlJsEditingSettings::mininumQmllsVersion.toString())); .arg(QmlJsEditingSettings::mininumQmllsVersion.toString()));
@@ -256,13 +251,11 @@ QmlJsEditingSettings::QmlJsEditingSettings()
Tr::tr("Use custom command instead of built-in formatter")); Tr::tr("Use custom command instead of built-in formatter"));
formatCommand.setSettingsKey(group, FORMAT_COMMAND); formatCommand.setSettingsKey(group, FORMAT_COMMAND);
formatCommand.setEnabler(&useCustomFormatCommand);
formatCommand.setDisplayStyle(StringAspect::LineEditDisplay); formatCommand.setDisplayStyle(StringAspect::LineEditDisplay);
formatCommand.setPlaceHolderText(defaultFormatCommand()); formatCommand.setPlaceHolderText(defaultFormatCommand());
formatCommand.setLabelText(Tr::tr("Command:")); formatCommand.setLabelText(Tr::tr("Command:"));
formatCommandOptions.setSettingsKey(group, FORMAT_COMMAND_OPTIONS); formatCommandOptions.setSettingsKey(group, FORMAT_COMMAND_OPTIONS);
formatCommandOptions.setEnabler(&useCustomFormatCommand);
formatCommandOptions.setDisplayStyle(StringAspect::LineEditDisplay); formatCommandOptions.setDisplayStyle(StringAspect::LineEditDisplay);
formatCommandOptions.setLabelText(Tr::tr("Arguments:")); formatCommandOptions.setLabelText(Tr::tr("Arguments:"));
@@ -280,6 +273,14 @@ QmlJsEditingSettings::QmlJsEditingSettings()
disabledMessagesForNonQuickUi.setToSettingsTransformation(&toSettingsTransformation); disabledMessagesForNonQuickUi.setToSettingsTransformation(&toSettingsTransformation);
readSettings(); readSettings();
autoFormatOnlyCurrentProject.setEnabler(&autoFormatOnSave);
useLatestQmlls.setEnabler(&useQmlls);
disableBuiltinCodemodel.setEnabler(&useQmlls);
generateQmllsIniFiles.setEnabler(&useQmlls);
ignoreMinimumQmllsVersion.setEnabler(&useQmlls);
formatCommand.setEnabler(&useCustomFormatCommand);
formatCommandOptions.setEnabler(&useCustomFormatCommand);
} }
QString QmlJsEditingSettings::defaultFormatCommand() const QString QmlJsEditingSettings::defaultFormatCommand() const