Merge remote-tracking branch 'origin/3.5'

Change-Id: I37bb3dcc54d49250a5d45d8dd35484dc3b5fa89f

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" }
 

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

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;
 }