feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp

Change-Id: Ied74b2e97a51bd5ee67864e6dd5c830d57ea3099
This commit is contained in:
Eike Ziller
2014-09-16 15:20:38 +02:00
parent 83be08fe41 61065b9a99
commit 3b74cda11a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2013 Digia Plc ** Copyright (C) 2014 Digia Plc
** All rights reserved. ** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/> ** 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>(); = ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>();
if (licenseChecker && licenseChecker->hasValidLicense()) { if (licenseChecker && licenseChecker->hasValidLicense()) {
addAutoReleasedObject(new PixmapCacheModel); if (licenseChecker->enterpriseFeatures()) {
addAutoReleasedObject(new SceneGraphTimelineModel); addAutoReleasedObject(new PixmapCacheModel);
addAutoReleasedObject(new MemoryUsageModel); addAutoReleasedObject(new SceneGraphTimelineModel);
addAutoReleasedObject(new InputEventsModel); addAutoReleasedObject(new MemoryUsageModel);
addAutoReleasedObject(new InputEventsModel);
}
} else { } else {
qWarning() << "Invalid license, disabling QML Profiler Enterprise features"; qWarning() << "Invalid license, disabling QML Profiler Enterprise features";
} }