diff options
Diffstat (limited to 'src/plugins/perfprofiler')
4 files changed, 13 insertions, 8 deletions
diff --git a/src/plugins/perfprofiler/PerfProfiler.json.in b/src/plugins/perfprofiler/PerfProfiler.json.in index c3a439b1a5..eeca090e04 100644 --- a/src/plugins/perfprofiler/PerfProfiler.json.in +++ b/src/plugins/perfprofiler/PerfProfiler.json.in @@ -13,7 +13,12 @@ "Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html." ], "Category" : "Code Analyzer", - "Description" : "Perf Profiler Plugin.", - "Url" : "http://www.qt.io", + "Description" : "Analyze the CPU and memory usage of an application", + "LongDescription" : [ + "Works on embedded devices and, to a limited extent, on Linux desktop platforms.", + "You also need:", + "- Perf tool (bundled with the Linux kernel)" + ], + "Url" : "https://www.qt.io", ${IDE_PLUGIN_DEPENDENCIES} } diff --git a/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp b/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp index 076c977888..2d0c451589 100644 --- a/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp +++ b/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp @@ -28,7 +28,7 @@ PerfProfilerFlameGraphView::PerfProfilerFlameGraphView(QWidget *parent) rootContext()->setContextProperty(QStringLiteral("flameGraphModel"), m_model); setSource(QUrl(QStringLiteral( "qrc:/qt/qml/QtCreator/PerfProfiler/PerfProfilerFlameGraphView.qml"))); - setClearColor(Utils::creatorTheme()->color(Utils::Theme::Timeline_BackgroundColor1)); + setClearColor(Utils::creatorColor(Utils::Theme::Timeline_BackgroundColor1)); setResizeMode(QQuickWidget::SizeRootObjectToView); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); diff --git a/src/plugins/perfprofiler/perftimelinemodel.cpp b/src/plugins/perfprofiler/perftimelinemodel.cpp index fac136024b..904a73fe43 100644 --- a/src/plugins/perfprofiler/perftimelinemodel.cpp +++ b/src/plugins/perfprofiler/perftimelinemodel.cpp @@ -86,12 +86,12 @@ QVariantList PerfTimelineModel::labels() const QString prettyPrintTraceData(const QVariant &data) { - switch (data.type()) { - case QVariant::ULongLong: + switch (data.typeId()) { + case QMetaType::ULongLong: return QString::fromLatin1("0x%1").arg(data.toULongLong(), 16, 16, QLatin1Char('0')); - case QVariant::UInt: + case QMetaType::UInt: return QString::fromLatin1("0x%1").arg(data.toUInt(), 8, 16, QLatin1Char('0')); - case QVariant::List: { + case QMetaType::QVariantList: { QStringList ret; for (const QVariant &item : data.toList()) ret.append(prettyPrintTraceData(item)); diff --git a/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp b/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp index 8930573f32..8ccada8f4b 100644 --- a/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp +++ b/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp @@ -210,7 +210,7 @@ ResourcesRenderPassState::ResourcesRenderPassState() : node = new QSGNode; node->setFlag(QSGNode::OwnedByParent, false); m_expandedRows.append(node); - m_material.setColor(Utils::creatorTheme()->color(Utils::Theme::Timeline_HighlightColor)); + m_material.setColor(Utils::creatorColor(Utils::Theme::Timeline_HighlightColor)); // Disable blending m_material.setFlag(QSGMaterial::Blending, false); |