Merge remote-tracking branch 'origin/3.2'

Conflicts:
	plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp

Change-Id: Ied74b2e97a51bd5ee67864e6dd5c830d57ea3099

1 files changed, 7 insertions, 5 deletions

diff --git a/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp b/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
index 5bd03c34f0..20c9e2017f 100644
--- a/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
+++ b/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
 **
@@ -72,10 +72,12 @@ bool QmlProfilerExtensionPlugin::initialize(const QStringList &arguments, QStrin
             = ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>();
 
     if (licenseChecker && licenseChecker->hasValidLicense()) {
-        addAutoReleasedObject(new PixmapCacheModel);
-        addAutoReleasedObject(new SceneGraphTimelineModel);
-        addAutoReleasedObject(new MemoryUsageModel);
-        addAutoReleasedObject(new InputEventsModel);
+        if (licenseChecker->enterpriseFeatures()) {
+            addAutoReleasedObject(new PixmapCacheModel);
+            addAutoReleasedObject(new SceneGraphTimelineModel);
+            addAutoReleasedObject(new MemoryUsageModel);
+            addAutoReleasedObject(new InputEventsModel);
+        }
     } else {
         qWarning() << "Invalid license, disabling QML Profiler Enterprise features";
     }