aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-09-04 16:24:59 +0200
committerKai Koehne <kai.koehne@digia.com>2014-09-08 13:49:44 +0300
commit61065b9a998baea497f71992e6ef6f6313f0859e (patch)
tree34cb1f59ffd63f2327806598f975cc465e1e2230
parent80d938c6a31be9f45f0ceaa289a5f8c04c8f33dc (diff)
Hide features for new "Indie" licenseqp-v3.2.2qp-v3.2.1qp-3.2
This requires http://qt-gerrit.it.local/#change,6220 in licensechecker.git Change-Id: Ia7bc7bcee90d3099805a43106f1f0b695bbf059b Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
-rw-r--r--plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp b/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
index 2a1f493075..e387c7ea05 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/>
**
@@ -71,9 +71,11 @@ 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);
+ if (licenseChecker->enterpriseFeatures()) {
+ addAutoReleasedObject(new PixmapCacheModel);
+ addAutoReleasedObject(new SceneGraphTimelineModel);
+ addAutoReleasedObject(new MemoryUsageModel);
+ }
} else {
qWarning() << "Invalid license, disabling QML Profiler Enterprise features";
}