From b3e4cf2032fe9899caac60ceb7029ca33ce68771 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@theqtcompany.com>
Date: Thu, 11 Jun 2015 17:31:39 +0200
Subject: Make licensechecker dependency optional

Change-Id: Ibf66800bac5f674fb015f4aaf3923b824651e75b
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
---
 .../qmlprofilerextension/qmlprofilerextension_dependencies.pri    | 5 +++--
 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;
 }
-- 
cgit v1.2.3