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

Make licensechecker dependency optional

Browse Source 
Change-Id: Ia353ef7065dbd7dd3ff1f3a9293613cf7f14ce37
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Kai Koehne
2015-06-11 17:21:54 +02:00
parent a133256e37
commit eee4f2c6ac
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/autotest/autotest.pro
View File

@@ -7,6 +7,7 @@ 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 \

5
plugins/autotest/autotest_dependencies.pri
View File

@@ -5,8 +5,9 @@ QTC_PLUGIN_DEPENDS += \
projectexplorer \ projectexplorer \
cpptools \ cpptools \
qmljstools \ qmljstools \
qmakeprojectmanager \ qmakeprojectmanager
licensechecker
CONFIG(licensechecker): QTC_PLUGIN_DEPENDS += licensechecker
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
cplusplus \ cplusplus \

6
plugins/autotest/autotestplugin.cpp
View File

@@ -38,7 +38,9 @@
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <licensechecker/licensecheckerplugin.h> #ifdef LICENSECHECKER
# include <licensechecker/licensecheckerplugin.h>
#endif
#include <QAction> #include <QAction>
#include <QMessageBox> #include <QMessageBox>
@@ -89,6 +91,7 @@ QSharedPointer<TestSettings> AutotestPlugin::settings() const
bool AutotestPlugin::checkLicense() bool AutotestPlugin::checkLicense()
{ {
#ifdef LICENSECHECKER
LicenseChecker::LicenseCheckerPlugin *licenseChecker LicenseChecker::LicenseCheckerPlugin *licenseChecker
= ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>(); = ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>();
@@ -97,6 +100,7 @@ bool AutotestPlugin::checkLicense()
return false; return false;
} else if (!licenseChecker->enterpriseFeatures()) } else if (!licenseChecker->enterpriseFeatures())
return false; return false;
#endif // LICENSECHECKER
return true; return true;
} }