diff --git a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp index 9ba4bfd26b1..ade7a521a89 100644 --- a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp @@ -29,6 +29,8 @@ #include #include +#include + #include #include @@ -39,6 +41,14 @@ namespace QmlDesigner { +static bool enableModelEditor() +{ + Utils::QtcSettings *settings = Core::ICore::settings(); + const Utils::Key enableModelManagerKey = "QML/Designer/UseExperimentalFeatures44"; + + return settings->value(enableModelManagerKey, false).toBool(); +} + static Q_LOGGING_CATEGORY(viewBenchmark, "qtc.viewmanager.attach", QtWarningMsg) class ViewManagerData @@ -203,8 +213,10 @@ QList ViewManager::standardViews() const &d->materialBrowserView, &d->textureEditorView, &d->statesEditorView, - &d->designerActionManagerView, - &d->collectionView}; + &d->designerActionManagerView}; + + if (enableModelEditor()) + list.append(&d->collectionView); if (QmlDesignerPlugin::instance() ->settings() @@ -386,7 +398,8 @@ QList ViewManager::widgetInfos() const widgetInfoList.append(d->materialBrowserView.widgetInfo()); widgetInfoList.append(d->textureEditorView.widgetInfo()); widgetInfoList.append(d->statesEditorView.widgetInfo()); - widgetInfoList.append(d->collectionView.widgetInfo()); + if (enableModelEditor()) + widgetInfoList.append(d->collectionView.widgetInfo()); #ifdef CHECK_LICENSE if (checkLicense() == FoundLicense::enterprise)