From 7b52372e3ef0bd1eef88ea166b67dbff1df4bc07 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Wed, 9 Apr 2014 17:25:34 +0200
Subject: [PATCH] Qml Profilder Views: Make consistent with other views
Use double click on double click platforms, fix keyboard activation
Change-Id: I36891fb2f733684a1a5c3787e0682cb9ddccb0d3
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
---
src/plugins/qmlprofiler/qmlprofilereventview.cpp | 4 ++--
src/plugins/qmlprofiler/qmlprofilertreeview.cpp | 3 ++-
src/plugins/qmlprofiler/qmlprofilertreeview.h | 4 ++--
src/plugins/qmlprofiler/qv8profilereventview.cpp | 4 ++--
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
index ddf2365e031..ed8d6bb1c8e 100644
--- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
@@ -381,7 +381,7 @@ QmlProfilerEventsMainView::QmlProfilerEventsMainView(QWidget *parent,
d->m_model = new QStandardItemModel(this);
setModel(d->m_model);
- connect(this,SIGNAL(clicked(QModelIndex)), this,SLOT(jumpToItem(QModelIndex)));
+ connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(jumpToItem(QModelIndex)));
d->modelProxy = modelProxy;
connect(d->modelProxy,SIGNAL(dataAvailable()), this, SLOT(buildModel()));
@@ -831,7 +831,7 @@ QmlProfilerEventRelativesView::QmlProfilerEventRelativesView(QmlProfilerModelMan
setRootIsDecorated(false);
updateHeader();
- connect(this,SIGNAL(clicked(QModelIndex)), this,SLOT(jumpToItem(QModelIndex)));
+ connect(this,SIGNAL(activated(QModelIndex)), this,SLOT(jumpToItem(QModelIndex)));
// Clear when new data available as the selection may be invalid now.
connect(d->modelProxy, SIGNAL(dataAvailable()), this, SLOT(clear()));
diff --git a/src/plugins/qmlprofiler/qmlprofilertreeview.cpp b/src/plugins/qmlprofiler/qmlprofilertreeview.cpp
index bacc8ceb2a3..a85c168b403 100644
--- a/src/plugins/qmlprofiler/qmlprofilertreeview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertreeview.cpp
@@ -28,6 +28,7 @@
****************************************************************************/
#include "qmlprofilertreeview.h"
+#include <utils/itemviews.h>
#include <QCoreApplication>
#include <QHeaderView>
@@ -35,7 +36,7 @@ namespace QmlProfiler {
namespace Internal {
QmlProfilerTreeView::QmlProfilerTreeView(QWidget *parent)
- : QTreeView(parent)
+ : Utils::TreeView(parent)
{
setFrameStyle(QFrame::NoFrame);
header()->setResizeMode(QHeaderView::Interactive);
diff --git a/src/plugins/qmlprofiler/qmlprofilertreeview.h b/src/plugins/qmlprofiler/qmlprofilertreeview.h
index 6b80b1ee61a..5d71bd14b59 100644
--- a/src/plugins/qmlprofiler/qmlprofilertreeview.h
+++ b/src/plugins/qmlprofiler/qmlprofilertreeview.h
@@ -30,12 +30,12 @@
#ifndef QMLPROFILERTREEVIEW
#define QMLPROFILERTREEVIEW
-#include <QTreeView>
+#include <utils/itemviews.h>
namespace QmlProfiler {
namespace Internal {
-class QmlProfilerTreeView : public QTreeView
+class QmlProfilerTreeView : public Utils::TreeView
{
Q_OBJECT
diff --git a/src/plugins/qmlprofiler/qv8profilereventview.cpp b/src/plugins/qmlprofiler/qv8profilereventview.cpp
index 92d9f188b59..0ab78cb01e1 100644
--- a/src/plugins/qmlprofiler/qv8profilereventview.cpp
+++ b/src/plugins/qmlprofiler/qv8profilereventview.cpp
@@ -291,7 +291,7 @@ QV8ProfilerEventsMainView::QV8ProfilerEventsMainView(QWidget *parent,
d->m_model = new QStandardItemModel(this);
setModel(d->m_model);
- connect(this,SIGNAL(clicked(QModelIndex)), this,SLOT(jumpToItem(QModelIndex)));
+ connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(jumpToItem(QModelIndex)));
d->m_v8Model = v8Model;
connect(d->m_v8Model, SIGNAL(changed()), this, SLOT(buildModel()));
@@ -631,7 +631,7 @@ QV8ProfilerEventRelativesView::QV8ProfilerEventRelativesView(QV8ProfilerDataMode
updateHeader();
setSortingEnabled(false);
- connect(this, SIGNAL(clicked(QModelIndex)), this, SLOT(jumpToItem(QModelIndex)));
+ connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(jumpToItem(QModelIndex)));
}
QV8ProfilerEventRelativesView::~QV8ProfilerEventRelativesView()
--
GitLab