diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-01 14:15:34 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-01 14:15:37 +0200 |
| commit | cc5fe6a00e7f08a011c8c2c1938b1a8bc057ff10 (patch) | |
| tree | fee23acbec2dd79a8e220fa3dd33e3c90bb711ac | |
| parent | abde4163c704bbf5c5a4c7409dbb7e81bdcc35ca (diff) | |
| parent | 1cad9ae88c778f16e00ff37b2b71abeed87f5316 (diff) | |
| download | qt-creator-cc5fe6a00e7f08a011c8c2c1938b1a8bc057ff10.tar.gz | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: I37bb3dcc54d49250a5d45d8dd35484dc3b5fa89f
3 files changed, 11 insertions, 5 deletions
diff --git a/plugins/qmlprofilerextension/qmlprofilerextension.qbs b/plugins/qmlprofilerextension/qmlprofilerextension.qbs index d95e4fcb81..7105207e1e 100644 --- a/plugins/qmlprofilerextension/qmlprofilerextension.qbs +++ b/plugins/qmlprofilerextension/qmlprofilerextension.qbs @@ -1,10 +1,9 @@ import qbs -QtcPlugin { +QtcCommercialPlugin { name: "QmlProfilerExtension" Depends { name: "Core" } - Depends { name: "LicenseChecker" } Depends { name: "QmlProfiler" } Depends { name: "Timeline" } diff --git a/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri b/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri index 55fd852b27..7ffa4d0623 100644 --- a/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri +++ b/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri @@ -1,4 +1,5 @@ QTC_PLUGIN_NAME = QmlProfilerExtension 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; } |