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

QmlDesigner: Fix content library license check

Browse Source 
Fixes: QDS-9680
Change-Id: I96a85bba779f373144fb04b4ede4b39f898957e6
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Miikka Heikkinen
2023-12-04 11:27:37 +02:00
committed by Tim Jenssen
parent 70f9e35c62
commit 11a84a8754
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@
#include <debugview.h> #include <debugview.h>
#include <designeractionmanagerview.h> #include <designeractionmanagerview.h>
#include <designmodewidget.h> #include <designmodewidget.h>
#include <dynamiclicensecheck.h>
#include <edit3dview.h> #include <edit3dview.h>
#include <formeditorview.h> #include <formeditorview.h>
#include <itemlibraryview.h> #include <itemlibraryview.h>
@@ -224,12 +225,8 @@ QList<AbstractView *> ViewManager::standardViews() const
.toBool()) .toBool())
list.append(&d->debugView); list.append(&d->debugView);
#ifdef CHECK_LICENSE if (checkEnterpriseLicense())
if (checkLicense() == FoundLicense::enterprise)
list.append(&d->contentLibraryView); list.append(&d->contentLibraryView);
#else
list.append(&d->contentLibraryView);
#endif
return list; return list;
} }
@@ -401,12 +398,8 @@ QList<WidgetInfo> ViewManager::widgetInfos() const
if (enableModelEditor()) if (enableModelEditor())
widgetInfoList.append(d->collectionView.widgetInfo()); widgetInfoList.append(d->collectionView.widgetInfo());
#ifdef CHECK_LICENSE if (checkEnterpriseLicense())
if (checkLicense() == FoundLicense::enterprise)
widgetInfoList.append(d->contentLibraryView.widgetInfo()); 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());