aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/designersettings.cpp
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2018-10-24 13:40:59 +0200
committerTim Jenssen <tim.jenssen@qt.io>2018-10-24 14:10:35 +0000
commit2bfe4bbf06c44eccdbe3b4536413acbd2a306487 (patch)
treedfb61fe2ab4b20be77a1df695532cdb585aaa5ae /src/plugins/qmldesigner/designersettings.cpp
parente0acdaf19120efec572f929a2c26fa9146272ba5 (diff)
QmlDesigner: use better settings names
The name is better and we avoid problems if the default was saved by wrong old code which is fixed in the current code. (The fix does not save the path if it is the default path) Change-Id: Ifd1d4fc7931fed976de12e3e256915458ffc762a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/designersettings.cpp')
-rw-r--r--src/plugins/qmldesigner/designersettings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp
index d1e8a3a569..899f3f5e5e 100644
--- a/src/plugins/qmldesigner/designersettings.cpp
+++ b/src/plugins/qmldesigner/designersettings.cpp
@@ -60,9 +60,9 @@ void DesignerSettings::fromSettings(QSettings *settings)
restoreValue(settings, DesignerSettingsKey::SHOW_DEBUGVIEW, false);
restoreValue(settings, DesignerSettingsKey::ENABLE_DEBUGVIEW, false);
restoreValue(settings, DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR, false);
- restoreValue(settings, DesignerSettingsKey::USE_ONLY_FALLBACK_PUPPET, true);
+ restoreValue(settings, DesignerSettingsKey::USE_DEFAULT_PUPPET, true);
restoreValue(settings, DesignerSettingsKey::TYPE_OF_QSTR_FUNCTION, 0);
- restoreValue(settings, DesignerSettingsKey::PUPPET_FALLBACK_DIRECTORY);
+ restoreValue(settings, DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY);
restoreValue(settings, DesignerSettingsKey::PUPPET_TOPLEVEL_BUILD_DIRECTORY);
restoreValue(settings, DesignerSettingsKey::CONTROLS_STYLE);
restoreValue(settings, DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS, false);