From 5448e7bab84c7abd9e03234e66c952ad4315f419 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 22 Jan 2016 10:43:28 +0100 Subject: [PATCH] Remove licensechecker dependency Change-Id: Ie15e903f3e7f0fde3c7e4127584c573741aee19f Reviewed-by: Eike Ziller --- plugins/autotest/autotest.pro | 3 --- plugins/autotest/autotest_dependencies.pri | 2 -- plugins/autotest/autotestplugin.cpp | 22 ---------------------- 3 files changed, 27 deletions(-) diff --git a/plugins/autotest/autotest.pro b/plugins/autotest/autotest.pro index 45ab5582909..057060f2fac 100644 --- a/plugins/autotest/autotest.pro +++ b/plugins/autotest/autotest.pro @@ -1,13 +1,10 @@ TARGET = AutoTest TEMPLATE = lib -PROVIDER = Digia - include(../../qtcreatorplugin.pri) include(autotest_dependencies.pri) DEFINES += AUTOTEST_LIBRARY -CONFIG(licensechecker): DEFINES += LICENSECHECKER SOURCES += \ testtreeview.cpp \ diff --git a/plugins/autotest/autotest_dependencies.pri b/plugins/autotest/autotest_dependencies.pri index 9410d779504..ab2e02f054d 100644 --- a/plugins/autotest/autotest_dependencies.pri +++ b/plugins/autotest/autotest_dependencies.pri @@ -6,8 +6,6 @@ QTC_PLUGIN_DEPENDS += \ cpptools \ qmljstools -CONFIG(licensechecker): QTC_PLUGIN_DEPENDS += licensechecker - QTC_LIB_DEPENDS += \ cplusplus \ qmljs \ diff --git a/plugins/autotest/autotestplugin.cpp b/plugins/autotest/autotestplugin.cpp index 7ab0a8f1d95..83f3be8da46 100644 --- a/plugins/autotest/autotestplugin.cpp +++ b/plugins/autotest/autotestplugin.cpp @@ -44,10 +44,6 @@ #include -#ifdef LICENSECHECKER -# include -#endif - #include #include #include @@ -95,21 +91,6 @@ QSharedPointer AutotestPlugin::settings() const return m_settings; } -bool AutotestPlugin::checkLicense() -{ -#ifdef LICENSECHECKER - LicenseChecker::LicenseCheckerPlugin *licenseChecker - = ExtensionSystem::PluginManager::getObject(); - - 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() { ActionContainer *menu = ActionManager::createMenu(Constants::MENU_ID); @@ -147,9 +128,6 @@ bool AutotestPlugin::initialize(const QStringList &arguments, QString *errorStri Q_UNUSED(arguments) Q_UNUSED(errorString) - if (!checkLicense()) - return true; - initializeMenuEntries(); m_settings->fromSettings(ICore::settings());