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

Remove dependency on licensechecker

Browse Source 
Change-Id: I806983db89468f39dc781e9fd082f862b335a0d8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-01-21 15:49:14 +01:00
committed by Eike Ziller
parent 49eceedb58
commit ed15f7067d
3 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/qmlprofiler/qmlprofiler.pro
View File

@@ -6,7 +6,6 @@ include(../../qtcreatorplugin.pri)
QT += qml quick quickwidgets QT += qml quick quickwidgets
DEFINES += QMLPROFILEREXTENSION_LIBRARY DEFINES += QMLPROFILEREXTENSION_LIBRARY
CONFIG(licensechecker): DEFINES += LICENSECHECKER
# QmlProfilerExtension files # QmlProfilerExtension files

1
plugins/qmlprofiler/qmlprofiler_dependencies.pri
View File

@@ -2,4 +2,3 @@ QTC_PLUGIN_NAME = QmlProfilerExtension
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
qmlprofiler qmlprofiler
CONFIG(licensechecker): QTC_PLUGIN_DEPENDS += licensechecker

19
plugins/qmlprofiler/qmlprofilerextensionplugin.cpp
View File

@@ -27,10 +27,6 @@
#include "qmlprofilerextensionconstants.h" #include "qmlprofilerextensionconstants.h"
#include <qmlprofiler/qmlprofilertimelinemodelfactory.h> #include <qmlprofiler/qmlprofilertimelinemodelfactory.h>
#ifdef LICENSECHECKER
# include <licensechecker/licensecheckerplugin.h>
#endif
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
@@ -108,21 +104,8 @@ bool QmlProfilerExtensionPlugin::initialize(const QStringList &arguments, QStrin
Q_UNUSED(arguments) Q_UNUSED(arguments)
Q_UNUSED(errorString) 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); addAutoReleasedObject(new ModelFactory);
#endif addAutoReleasedObject(new ViewFactory);
return true; return true;
} }