diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-11 17:31:39 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-25 16:32:10 +0300 |
| commit | b3e4cf2032fe9899caac60ceb7029ca33ce68771 (patch) | |
| tree | 7b91a167c67610b3fbfe38cfbf920193a244ae19 | |
| parent | ac4162d459b831e9233c6a3f18d4b9392588187b (diff) | |
Make licensechecker dependency optional
Change-Id: Ibf66800bac5f674fb015f4aaf3923b824651e75b
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
| -rw-r--r-- | plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri | 5 | ||||
| -rw-r--r-- | plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri b/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri index 902c368024..4a30c93cee 100644 --- a/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri +++ b/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri @@ -3,5 +3,6 @@ QTC_PLUGIN_NAME = QmlProfilerExtension # qmldebug \ # extensionsystem QTC_PLUGIN_DEPENDS += \ - qmlprofiler \ - licensechecker \ + qmlprofiler + +CONFIG(licensechecker): QT_PLUGIN_DEPENDS += licensechecker diff --git a/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp b/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp index 93923332f7..0015b02f97 100644 --- a/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp +++ b/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp @@ -20,7 +20,9 @@ #include "qmlprofilerextensionconstants.h" #include <qmlprofiler/qmlprofilertimelinemodelfactory.h> -#include <licensechecker/licensecheckerplugin.h> +#ifdef LICENSECHECKER +# include <licensechecker/licensecheckerplugin.h> +#endif #include <coreplugin/icore.h> #include <coreplugin/icontext.h> @@ -84,6 +86,7 @@ bool QmlProfilerExtensionPlugin::initialize(const QStringList &arguments, QStrin Q_UNUSED(arguments) Q_UNUSED(errorString) +#ifdef LICENSECHECKER LicenseChecker::LicenseCheckerPlugin *licenseChecker = ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>(); @@ -93,6 +96,9 @@ bool QmlProfilerExtensionPlugin::initialize(const QStringList &arguments, QStrin } else { qWarning() << "Invalid license, disabling QML Profiler Enterprise features"; } +#else // LICENSECHECKER + addAutoReleasedObject(new ModelFactory); +#endif return true; } |