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

Remove licensechecker dependency

Browse Source 
Change-Id: Ie15e903f3e7f0fde3c7e4127584c573741aee19f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Christian Stenger
2016-01-22 10:43:28 +01:00
committed by Eike Ziller
parent 08011b5dee
commit 5448e7bab8
3 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/autotest/autotest.pro
View File

@@ -1,13 +1,10 @@
TARGET = AutoTest TARGET = AutoTest
TEMPLATE = lib TEMPLATE = lib
PROVIDER = Digia
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(autotest_dependencies.pri) include(autotest_dependencies.pri)
DEFINES += AUTOTEST_LIBRARY DEFINES += AUTOTEST_LIBRARY
CONFIG(licensechecker): DEFINES += LICENSECHECKER
SOURCES += \ SOURCES += \
testtreeview.cpp \ testtreeview.cpp \

2
plugins/autotest/autotest_dependencies.pri
View File

@@ -6,8 +6,6 @@ QTC_PLUGIN_DEPENDS += \
cpptools \ cpptools \
qmljstools qmljstools
CONFIG(licensechecker): QTC_PLUGIN_DEPENDS += licensechecker
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
cplusplus \ cplusplus \
qmljs \ qmljs \

22
plugins/autotest/autotestplugin.cpp
View File

@@ -44,10 +44,6 @@
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#ifdef LICENSECHECKER
# include <licensechecker/licensecheckerplugin.h>
#endif
#include <QAction> #include <QAction>
#include <QMessageBox> #include <QMessageBox>
#include <QMainWindow> #include <QMainWindow>
@@ -95,21 +91,6 @@ QSharedPointer<TestSettings> AutotestPlugin::settings() const
return m_settings; return m_settings;
} }
bool AutotestPlugin::checkLicense()
{
#ifdef LICENSECHECKER
LicenseChecker::LicenseCheckerPlugin *licenseChecker
= ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>();
if (!licenseChecker || !licenseChecker->hasValidLicense()) {
qWarning() << "Invalid license, disabling Qt Creator Enterprise Auto Test Add-on.";
return false;
} else if (!licenseChecker->enterpriseFeatures())
return false;
#endif // LICENSECHECKER
return true;
}
void AutotestPlugin::initializeMenuEntries() void AutotestPlugin::initializeMenuEntries()
{ {
ActionContainer *menu = ActionManager::createMenu(Constants::MENU_ID); ActionContainer *menu = ActionManager::createMenu(Constants::MENU_ID);
@@ -147,9 +128,6 @@ bool AutotestPlugin::initialize(const QStringList &arguments, QString *errorStri
Q_UNUSED(arguments) Q_UNUSED(arguments)
Q_UNUSED(errorString) Q_UNUSED(errorString)
if (!checkLicense())
return true;
initializeMenuEntries(); initializeMenuEntries();
m_settings->fromSettings(ICore::settings()); m_settings->fromSettings(ICore::settings());