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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Change-Id: I3ecb199025eb536045ec23e3afc3fe903e2dae63
This commit is contained in:
Kai Koehne
2014-02-12 14:40:25 +01:00
parent c76f09b985 30035cea42
commit dd5500e166
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/qmlprofilerextension/pixmapcachemodel.cpp
View File

@@ -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

3
plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri
View File

@@ -3,4 +3,5 @@ QTC_PLUGIN_NAME = QmlProfilerExtension
# qmldebug \
# extensionsystem
QTC_PLUGIN_DEPENDS += \
qmlprofiler
qmlprofiler \
licensechecker \

16
plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
View File

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