diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-21 15:49:14 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-01-22 14:05:38 +0000 |
| commit | ed15f7067df9f25475915b2f69d6ff4140b926c6 (patch) | |
| tree | 33297b76045bbd5155659475c7b637fde2a52c13 | |
| parent | 49eceedb58e05ae189b419b5eee9c536429bbb1e (diff) | |
Remove dependency on licensechecker
Change-Id: I806983db89468f39dc781e9fd082f862b335a0d8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| -rw-r--r-- | plugins/qmlprofiler/qmlprofiler.pro | 1 | ||||
| -rw-r--r-- | plugins/qmlprofiler/qmlprofiler_dependencies.pri | 1 | ||||
| -rw-r--r-- | plugins/qmlprofiler/qmlprofilerextensionplugin.cpp | 19 |
3 files changed, 1 insertions, 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; } |