From 166afd652166b42cc50ca0bee0aa0524201a9d28 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 17 Dec 2019 10:44:13 +0100 Subject: QmlDesigner: Increase the puppet timeout to 30s The puppet timeout creates issues with the 3D view. At the moment we do not know any case in which the puppet timeout is strictly required. Increasing the timeout to 30s should be safe. In the worst case users have to add the option to reduce the timeout again. Change-Id: I3a4b2b145f42b3fcabfdfaa97bc23ae10d6c1648 Reviewed-by: Mahmoud Badri Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/designersettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp index f1afe3cf66..e08035389f 100644 --- a/src/plugins/qmldesigner/designersettings.cpp +++ b/src/plugins/qmldesigner/designersettings.cpp @@ -67,7 +67,7 @@ void DesignerSettings::fromSettings(QSettings *settings) restoreValue(settings, DesignerSettingsKey::CONTROLS_STYLE); restoreValue(settings, DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS, false); restoreValue(settings, DesignerSettingsKey::ENABLE_MODEL_EXCEPTION_OUTPUT, false); - restoreValue(settings, DesignerSettingsKey::PUPPET_KILL_TIMEOUT, 3000); // this has no ui at the moment + restoreValue(settings, DesignerSettingsKey::PUPPET_KILL_TIMEOUT, 30000); // this has no ui at the moment restoreValue(settings, DesignerSettingsKey::DEBUG_PUPPET, QString()); restoreValue(settings, DesignerSettingsKey::FORWARD_PUPPET_OUTPUT, QString()); restoreValue(settings, DesignerSettingsKey::REFORMAT_UI_QML_FILES, true); -- cgit v1.2.1