forked from qt-creator/qt-creator
Remove licensechecker dependency
Change-Id: Ie15e903f3e7f0fde3c7e4127584c573741aee19f Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
committed by
Eike Ziller
parent
08011b5dee
commit
5448e7bab8
@@ -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 \
|
||||
|
@@ -6,8 +6,6 @@ QTC_PLUGIN_DEPENDS += \
|
||||
cpptools \
|
||||
qmljstools
|
||||
|
||||
CONFIG(licensechecker): QTC_PLUGIN_DEPENDS += licensechecker
|
||||
|
||||
QTC_LIB_DEPENDS += \
|
||||
cplusplus \
|
||||
qmljs \
|
||||
|
@@ -44,10 +44,6 @@
|
||||
|
||||
#include <extensionsystem/pluginmanager.h>
|
||||
|
||||
#ifdef LICENSECHECKER
|
||||
# include <licensechecker/licensecheckerplugin.h>
|
||||
#endif
|
||||
|
||||
#include <QAction>
|
||||
#include <QMessageBox>
|
||||
#include <QMainWindow>
|
||||
@@ -95,21 +91,6 @@ QSharedPointer<TestSettings> AutotestPlugin::settings() const
|
||||
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()
|
||||
{
|
||||
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());
|
||||
|
Reference in New Issue
Block a user