diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-12-17 10:44:13 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2019-12-17 10:14:19 +0000 |
| commit | 166afd652166b42cc50ca0bee0aa0524201a9d28 (patch) | |
| tree | d4d777143293c0ead764ddc4b0e75ead4c48723c | |
| parent | 2f2787c4a8518fc31086a2cf7b317dccdb3a1624 (diff) | |
| download | qt-creator-166afd652166b42cc50ca0bee0aa0524201a9d28.tar.gz | |
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 <mahmoud.badri@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/designersettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |