diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2019-02-21 13:45:27 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2019-02-21 14:22:27 +0000 |
| commit | 41d19e99e04de6115887e68cb9109461774e17ba (patch) | |
| tree | 71613f47f17f60e2e557f0f1248e59a4983e5d26 | |
| parent | 61775a844efc86a37aa8c11ffdefa23b1771cf10 (diff) | |
| download | qt-creator-41d19e99e04de6115887e68cb9109461774e17ba.tar.gz | |
QmlDesigner: Add environment variable for enabling timeline editor
This change adds the possibility to enable the QtQuick.Timeline editor
in the QtQuick Designer via an environment variable
QTC_ENABLE_QTQUICKTIMELINE_EDITOR
So, far this was only possible via a settings key.
Change-Id: I71ef8a17944abf5ee030383430a804282a4e9bec
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/designersettings.h | 1 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/qmldesignerplugin.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h index bdaa22bb4b..9b73dc1faf 100644 --- a/src/plugins/qmldesigner/designersettings.h +++ b/src/plugins/qmldesigner/designersettings.h @@ -65,6 +65,7 @@ const char REFORMAT_UI_QML_FILES[] = "ReformatUiQmlFiles"; /* These setti const char IGNORE_DEVICE_PIXEL_RATIO[] = "IgnoreDevicePixelRaio"; /* The settings can be used to turn off the feature, if there are serious issues */ const char STANDALONE_MODE[] = "StandAloneMode"; const char ENABLE_TIMELINEVIEW[] = "EnableTimelineView"; +const char ENABLE_TIMELINEVIEW_ENVVAR[] = "QTC_ENABLE_QTQUICKTIMELINE_EDITOR"; } class DesignerSettings : public QHash<QByteArray, QVariant> diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 84b95cccc3..09e10c3b0c 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -194,7 +194,8 @@ bool QmlDesignerPlugin::delayedInitialize() d->settings.fromSettings(Core::ICore::settings()); d->viewManager.registerViewTakingOwnership(new QmlDesigner::Internal::ConnectionView); - if (DesignerSettings::getValue(DesignerSettingsKey::ENABLE_TIMELINEVIEW).toBool()) + if (DesignerSettings::getValue(DesignerSettingsKey::ENABLE_TIMELINEVIEW).toBool() + || qEnvironmentVariableIsSet(DesignerSettingsKey::ENABLE_TIMELINEVIEW_ENVVAR)) d->viewManager.registerViewTakingOwnership(new QmlDesigner::TimelineView); d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::SourceTool); d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::ColorTool); |