forked from qt-creator/qt-creator
QmlDesigner: Show content library under enterprise license only
Fixes: QDS-8453 Change-Id: I84668ee370e494ff303734faefb0b5e0895ca061 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -219,7 +219,6 @@ QList<AbstractView *> ViewManager::standardViews() const
|
|||||||
&d->itemLibraryView,
|
&d->itemLibraryView,
|
||||||
&d->navigatorView,
|
&d->navigatorView,
|
||||||
&d->propertyEditorView,
|
&d->propertyEditorView,
|
||||||
&d->contentLibraryView,
|
|
||||||
&d->materialEditorView,
|
&d->materialEditorView,
|
||||||
&d->materialBrowserView,
|
&d->materialBrowserView,
|
||||||
&d->textureEditorView,
|
&d->textureEditorView,
|
||||||
@@ -238,6 +237,13 @@ QList<AbstractView *> ViewManager::standardViews() const
|
|||||||
.toBool())
|
.toBool())
|
||||||
list.append(&d->debugView);
|
list.append(&d->debugView);
|
||||||
|
|
||||||
|
#ifdef CHECK_LICENSE
|
||||||
|
if (checkLicense() == FoundLicense::enterprise)
|
||||||
|
list.append(&d->contentLibraryView);
|
||||||
|
#else
|
||||||
|
list.append(&d->contentLibraryView);
|
||||||
|
#endif
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -401,7 +407,6 @@ QList<WidgetInfo> ViewManager::widgetInfos() const
|
|||||||
widgetInfoList.append(d->itemLibraryView.widgetInfo());
|
widgetInfoList.append(d->itemLibraryView.widgetInfo());
|
||||||
widgetInfoList.append(d->navigatorView.widgetInfo());
|
widgetInfoList.append(d->navigatorView.widgetInfo());
|
||||||
widgetInfoList.append(d->propertyEditorView.widgetInfo());
|
widgetInfoList.append(d->propertyEditorView.widgetInfo());
|
||||||
widgetInfoList.append(d->contentLibraryView.widgetInfo());
|
|
||||||
widgetInfoList.append(d->materialEditorView.widgetInfo());
|
widgetInfoList.append(d->materialEditorView.widgetInfo());
|
||||||
widgetInfoList.append(d->materialBrowserView.widgetInfo());
|
widgetInfoList.append(d->materialBrowserView.widgetInfo());
|
||||||
widgetInfoList.append(d->textureEditorView.widgetInfo());
|
widgetInfoList.append(d->textureEditorView.widgetInfo());
|
||||||
@@ -410,6 +415,13 @@ QList<WidgetInfo> ViewManager::widgetInfos() const
|
|||||||
else
|
else
|
||||||
widgetInfoList.append(d->newStatesEditorView.widgetInfo());
|
widgetInfoList.append(d->newStatesEditorView.widgetInfo());
|
||||||
|
|
||||||
|
#ifdef CHECK_LICENSE
|
||||||
|
if (checkLicense() == FoundLicense::enterprise)
|
||||||
|
widgetInfoList.append(d->contentLibraryView.widgetInfo());
|
||||||
|
#else
|
||||||
|
widgetInfoList.append(d->contentLibraryView.widgetInfo());
|
||||||
|
#endif
|
||||||
|
|
||||||
if (d->debugView.hasWidget())
|
if (d->debugView.hasWidget())
|
||||||
widgetInfoList.append(d->debugView.widgetInfo());
|
widgetInfoList.append(d->debugView.widgetInfo());
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user