From 11a84a8754910f886ef7be6313d3fe119784f47e Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Mon, 4 Dec 2023 11:27:37 +0200
Subject: [PATCH] QmlDesigner: Fix content library license check

Fixes: QDS-9680
Change-Id: I96a85bba779f373144fb04b4ede4b39f898957e6
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../components/componentcore/viewmanager.cpp        | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp
index ade7a521a89..d26618dbdad 100644
--- a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp
@@ -15,6 +15,7 @@
 #include <debugview.h>
 #include <designeractionmanagerview.h>
 #include <designmodewidget.h>
+#include <dynamiclicensecheck.h>
 #include <edit3dview.h>
 #include <formeditorview.h>
 #include <itemlibraryview.h>
@@ -224,12 +225,8 @@ QList<AbstractView *> ViewManager::standardViews() const
             .toBool())
         list.append(&d->debugView);
 
-#ifdef CHECK_LICENSE
-    if (checkLicense() == FoundLicense::enterprise)
+    if (checkEnterpriseLicense())
         list.append(&d->contentLibraryView);
-#else
-    list.append(&d->contentLibraryView);
-#endif
 
     return list;
 }
@@ -401,12 +398,8 @@ QList<WidgetInfo> ViewManager::widgetInfos() const
     if (enableModelEditor())
         widgetInfoList.append(d->collectionView.widgetInfo());
 
-#ifdef CHECK_LICENSE
-    if (checkLicense() == FoundLicense::enterprise)
+    if (checkEnterpriseLicense())
         widgetInfoList.append(d->contentLibraryView.widgetInfo());
-#else
-    widgetInfoList.append(d->contentLibraryView.widgetInfo());
-#endif
 
     if (d->debugView.hasWidget())
         widgetInfoList.append(d->debugView.widgetInfo());