From ed7fb30e66a1d9e9501b1bc5fc4a0593566398dc Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 15 Jan 2020 17:43:44 +0100 Subject: [PATCH] QmlDesigner: Enable the QtQuick.Timeline editor by default if Qt >= 5.14 The QtQuick.Timeline module is an official Qt module since Qt 5.14. If Qt Creator (and thus the fallback puppet) are built with Qt 5.14 or higher, let the default setting for enabling the timeline editor be true. Change-Id: Ie44c6635914be0cca0fcbea488cfecf6c4ee0177 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designersettings.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp index e08035389ff..4944cef9db2 100644 --- a/src/plugins/qmldesigner/designersettings.cpp +++ b/src/plugins/qmldesigner/designersettings.cpp @@ -75,7 +75,13 @@ void DesignerSettings::fromSettings(QSettings *settings) restoreValue(settings, DesignerSettingsKey::STATESEDITOR_EXPANDED, true); restoreValue(settings, DesignerSettingsKey::NAVIGATOR_SHOW_ONLY_VISIBLE_ITEMS, true); restoreValue(settings, DesignerSettingsKey::STANDALONE_MODE, false); - restoreValue(settings, DesignerSettingsKey::ENABLE_TIMELINEVIEW, false); + restoreValue(settings, DesignerSettingsKey::ENABLE_TIMELINEVIEW, +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) + false +#else + true +#endif + ); restoreValue(settings, DesignerSettingsKey::SIMPLE_COLOR_PALETTE_CONTENT, QStringList()); restoreValue(settings, DesignerSettingsKey::ALWAYS_DESIGN_MODE, true);