From c09635e8501b9e9422080cb180a0f146b4d2b66d Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 17 Nov 2023 16:57:40 +0100
Subject: [PATCH] QmlDesigner: Use QML/Designer/UseExperimentalFeatures44 for
 ModelView

Change-Id: I4de7c2c0b64cbdda65d5258168b72fe13f6dbd07
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../components/componentcore/viewmanager.cpp  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

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 <textureeditorview.h>
 #include <qmldesignerplugin.h>
 
+#include <coreplugin/icore.h>
+
 #include <utils/algorithm.h>
 
 #include <advanceddockingsystem/dockwidget.h>
@@ -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<AbstractView *> 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<WidgetInfo> 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)