From b623da3b2e78701256577ad0d00aead9c2522dbe Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Mon, 2 Dec 2013 14:35:45 +0100
Subject: Send expandedChanged if expanded state changes.

If this is not done the timeline isn't immediately redrawn when the
category is expanded, which leads to stale data being shown.

Change-Id: If8da6dbe5c8124105e1e15fb5129df906114723f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
 plugins/qmlprofilerextension/pixmapcachemodel.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
index d1fec8d171..ce9e8b76c3 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
@@ -109,7 +109,10 @@ bool PixmapCacheModel::expanded(int ) const
 void PixmapCacheModel::setExpanded(int category, bool expanded)
 {
     Q_UNUSED(category);
+    bool prev_expanded = d->isExpanded;
     d->isExpanded = expanded;
+    if (prev_expanded != expanded)
+        emit expandedChanged();
 }
 
 int PixmapCacheModel::categoryDepth(int categoryIndex) const
-- 
cgit v1.2.1


From 30035cea42cf25287e99e6a9556639523ac9c2a6 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Thu, 12 Dec 2013 17:04:21 +0100
Subject: Disable functionality for invalid licenses

Change-Id: I2366784444e458bec30120809b151bfccd8b182f
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
 .../qmlprofilerextension_dependencies.pri                |  3 ++-
 .../qmlprofilerextension/qmlprofilerextensionplugin.cpp  | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri b/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri
index 43ab5d1dac..902c368024 100644
--- a/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri
+++ b/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri
@@ -3,4 +3,5 @@ QTC_PLUGIN_NAME = QmlProfilerExtension
 #    qmldebug \
 #    extensionsystem
 QTC_PLUGIN_DEPENDS += \
-    qmlprofiler
+    qmlprofiler \
+    licensechecker \
diff --git a/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp b/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
index 45ca48bc2e..c609ec0256 100644
--- a/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
+++ b/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
@@ -19,6 +19,8 @@
 #include "qmlprofilerextensionplugin.h"
 #include "qmlprofilerextensionconstants.h"
 
+#include <licensechecker/licensecheckerplugin.h>
+
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -26,7 +28,10 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/coreconstants.h>
 
+#include <extensionsystem/pluginmanager.h>
+
 #include <QAction>
+#include <QDebug>
 #include <QMessageBox>
 #include <QMainWindow>
 #include <QMenu>
@@ -61,8 +66,15 @@ bool QmlProfilerExtensionPlugin::initialize(const QStringList &arguments, QStrin
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
-    addAutoReleasedObject(new PixmapCacheModel);
-    addAutoReleasedObject(new SceneGraphTimelineModel);
+    LicenseChecker::LicenseCheckerPlugin *licenseChecker
+            = ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>();
+
+    if (licenseChecker && licenseChecker->hasValidLicense()) {
+        addAutoReleasedObject(new PixmapCacheModel);
+        addAutoReleasedObject(new SceneGraphTimelineModel);
+    } else {
+        qWarning() << "Invalid license, disabling QML Profiler Enterprise features";
+    }
 
     return true;
 }
-- 
cgit v1.2.1