From ed15f7067df9f25475915b2f69d6ff4140b926c6 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Thu, 21 Jan 2016 15:49:14 +0100
Subject: Remove dependency on licensechecker

Change-Id: I806983db89468f39dc781e9fd082f862b335a0d8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 plugins/qmlprofiler/qmlprofiler.pro                |  1 -
 plugins/qmlprofiler/qmlprofiler_dependencies.pri   |  1 -
 plugins/qmlprofiler/qmlprofilerextensionplugin.cpp | 19 +------------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/plugins/qmlprofiler/qmlprofiler.pro b/plugins/qmlprofiler/qmlprofiler.pro
index ba3ccbc93b..bf1e7f57ff 100644
--- a/plugins/qmlprofiler/qmlprofiler.pro
+++ b/plugins/qmlprofiler/qmlprofiler.pro
@@ -6,7 +6,6 @@ include(../../qtcreatorplugin.pri)
 QT += qml quick quickwidgets
 
 DEFINES += QMLPROFILEREXTENSION_LIBRARY
-CONFIG(licensechecker): DEFINES += LICENSECHECKER
 
 # QmlProfilerExtension files
 
diff --git a/plugins/qmlprofiler/qmlprofiler_dependencies.pri b/plugins/qmlprofiler/qmlprofiler_dependencies.pri
index 69ea4971bf..638fd4c0c0 100644
--- a/plugins/qmlprofiler/qmlprofiler_dependencies.pri
+++ b/plugins/qmlprofiler/qmlprofiler_dependencies.pri
@@ -2,4 +2,3 @@ QTC_PLUGIN_NAME = QmlProfilerExtension
 QTC_PLUGIN_DEPENDS += \
     qmlprofiler
 
-CONFIG(licensechecker): QTC_PLUGIN_DEPENDS += licensechecker
diff --git a/plugins/qmlprofiler/qmlprofilerextensionplugin.cpp b/plugins/qmlprofiler/qmlprofilerextensionplugin.cpp
index e8f1153a95..05c7ac9b9e 100644
--- a/plugins/qmlprofiler/qmlprofilerextensionplugin.cpp
+++ b/plugins/qmlprofiler/qmlprofilerextensionplugin.cpp
@@ -27,10 +27,6 @@
 #include "qmlprofilerextensionconstants.h"
 #include <qmlprofiler/qmlprofilertimelinemodelfactory.h>
 
-#ifdef LICENSECHECKER
-#  include <licensechecker/licensecheckerplugin.h>
-#endif
-
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -108,21 +104,8 @@ bool QmlProfilerExtensionPlugin::initialize(const QStringList &arguments, QStrin
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
-#ifdef LICENSECHECKER
-    LicenseChecker::LicenseCheckerPlugin *licenseChecker
-            = ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>();
-
-    if (licenseChecker && licenseChecker->hasValidLicense()) {
-        if (licenseChecker->enterpriseFeatures()) {
-            addAutoReleasedObject(new ModelFactory);
-            addAutoReleasedObject(new ViewFactory);
-        }
-    } else {
-        qWarning() << "Invalid license, disabling QML Profiler Enterprise features";
-    }
-#else // LICENSECHECKER
     addAutoReleasedObject(new ModelFactory);
-#endif
+    addAutoReleasedObject(new ViewFactory);
 
     return true;
 }
-- 
cgit v1.2.3