diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-11 17:29:00 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-25 16:32:04 +0300 |
| commit | d49232bbf122f9b65e9a1c25d296cdb9d130d4dd (patch) | |
| tree | ee85e85f6282448e458cc3ca5fbec425122c0493 | |
| parent | bd3195ec6bb96379c59079627da39b2db297bb4a (diff) | |
| download | qt-creator-d49232bbf122f9b65e9a1c25d296cdb9d130d4dd.tar.gz | |
Make licensechecker dependency optional
Change-Id: Ie867d2da37a507d36caaf16494f996b88ca4e142
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
3 files changed, 13 insertions, 4 deletions
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzer.pro b/plugins/clangstaticanalyzer/clangstaticanalyzer.pro index cdffb1f1d1..f348951ea7 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzer.pro +++ b/plugins/clangstaticanalyzer/clangstaticanalyzer.pro @@ -50,5 +50,7 @@ equals(TEST, 1) { RESOURCES += clangstaticanalyzerunittests.qrc } +CONFIG(licensechecker): DEFINES += LICENSECHECKER + DISTFILES += \ tests/tests.pri diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri b/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri index f857a18e43..22a09515c4 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri +++ b/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri @@ -4,8 +4,9 @@ QTC_LIB_DEPENDS += \ utils QTC_PLUGIN_DEPENDS += \ analyzerbase \ - cpptools \ - licensechecker + cpptools QTC_TEST_DEPENDS += \ qbsprojectmanager \ qmakeprojectmanager + +CONFIG(licensechecker): QTC_PLUGIN_DEPENDS += licensechecker diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp index 6e1b2bb79a..6668bfe9de 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp @@ -35,9 +35,12 @@ #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/coreconstants.h> #include <coreplugin/dialogs/ioptionspage.h> -#include <licensechecker/licensecheckerplugin.h> #include <projectexplorer/projectpanelfactory.h> +#ifdef LICENSECHECKER +#include <licensechecker/licensecheckerplugin.h> +#endif + #include <extensionsystem/pluginmanager.h> #include <QAction> @@ -114,6 +117,7 @@ bool ClangStaticAnalyzerPlugin::initialize(const QStringList &arguments, QString panelFactory->setSimpleCreateWidgetFunction<ProjectSettingsWidget>(QIcon()); ProjectExplorer::ProjectPanelFactory::registerFactory(panelFactory); +#ifdef LICENSECHECKER LicenseChecker::LicenseCheckerPlugin *licenseChecker = ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>(); @@ -123,8 +127,10 @@ bool ClangStaticAnalyzerPlugin::initialize(const QStringList &arguments, QString } else { qWarning() << "Invalid license, disabling Clang Static Analyzer"; } - return true; +#else // LICENSECHECKER + return initializeEnterpriseFeatures(arguments, errorString); +#endif } bool ClangStaticAnalyzerPlugin::initializeEnterpriseFeatures(const QStringList &arguments, |