feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Use QML/Designer/UseExperimentalFeatures44 for ModelView

Browse Source 
Change-Id: I4de7c2c0b64cbdda65d5258168b72fe13f6dbd07
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2023-11-17 16:57:40 +01:00
parent 9a8fa56a66
commit c09635e850
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qmldesigner/components/componentcore/viewmanager.cpp
View File

@@ -29,6 +29,8 @@
#include <textureeditorview.h> #include <textureeditorview.h>
#include <qmldesignerplugin.h> #include <qmldesignerplugin.h>
#include <coreplugin/icore.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <advanceddockingsystem/dockwidget.h> #include <advanceddockingsystem/dockwidget.h>
@@ -39,6 +41,14 @@
namespace QmlDesigner { 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) static Q_LOGGING_CATEGORY(viewBenchmark, "qtc.viewmanager.attach", QtWarningMsg)
class ViewManagerData class ViewManagerData
@@ -203,8 +213,10 @@ QList<AbstractView *> ViewManager::standardViews() const
&d->materialBrowserView, &d->materialBrowserView,
&d->textureEditorView, &d->textureEditorView,
&d->statesEditorView, &d->statesEditorView,
&d->designerActionManagerView, &d->designerActionManagerView};
&d->collectionView};
if (enableModelEditor())
list.append(&d->collectionView);
if (QmlDesignerPlugin::instance() if (QmlDesignerPlugin::instance()
->settings() ->settings()
@@ -386,6 +398,7 @@ QList<WidgetInfo> ViewManager::widgetInfos() const
widgetInfoList.append(d->materialBrowserView.widgetInfo()); widgetInfoList.append(d->materialBrowserView.widgetInfo());
widgetInfoList.append(d->textureEditorView.widgetInfo()); widgetInfoList.append(d->textureEditorView.widgetInfo());
widgetInfoList.append(d->statesEditorView.widgetInfo()); widgetInfoList.append(d->statesEditorView.widgetInfo());
if (enableModelEditor())
widgetInfoList.append(d->collectionView.widgetInfo()); widgetInfoList.append(d->collectionView.widgetInfo());
#ifdef CHECK_LICENSE #ifdef CHECK_LICENSE