diff options
author | Christiaan Janssen <christiaan.janssen@nokia.com> | 2012-05-02 17:53:50 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2012-05-04 15:09:18 +0200 |
commit | 2afa559c2a323adeba77fbc136fbaacc758bc448 (patch) | |
tree | 5be7425bbb6af750584f495581b9dfa8f1bce32d /src/plugins/qmlprofiler/qmlprofilereventview.cpp | |
parent | c4f67a3840cdb504f0a3022f0c3e32b60559cc8c (diff) | |
download | qt-creator-2afa559c2a323adeba77fbc136fbaacc758bc448.tar.gz |
QmlProfiler: show binding types
Change-Id: Iea469aa3e0fb7c4e5146163f049c930df6fc2b7d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilereventview.cpp')
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofilereventview.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp index 35ca59cf5a..cd10e98c59 100644 --- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp @@ -82,8 +82,8 @@ public: // first column if (column() == 0) { return data(FilenameRole).toString() == other.data(FilenameRole).toString() ? - data(LineRole).toInt() < other.data(LineRole).toInt() : - data(FilenameRole).toString() < other.data(FilenameRole).toString(); + data(LineRole).toInt() < other.data(LineRole).toInt() : + data(FilenameRole).toString() < other.data(FilenameRole).toString(); } else { return data().toString().toLower() < other.data().toString().toLower(); } @@ -115,9 +115,9 @@ public: }; QmlProfilerEventsWidget::QmlProfilerEventsWidget(QWidget *parent, - Analyzer::IAnalyzerTool *profilerTool, - QmlProfilerViewManager *container, - QmlProfilerDataModel *profilerDataModel ) + Analyzer::IAnalyzerTool *profilerTool, + QmlProfilerViewManager *container, + QmlProfilerDataModel *profilerDataModel ) : QWidget(parent), d(new QmlProfilerEventsWidgetPrivate(this)) { setObjectName("QmlProfilerEventsView"); @@ -603,8 +603,16 @@ void QmlProfilerEventsMainView::QmlProfilerEventsMainViewPrivate::buildModelFrom } if (m_fieldShown[Type]) { - newRow << new EventsViewItem(QmlProfilerEventsMainView::nameForType(binding->eventType)); - newRow.last()->setData(QVariant(QmlProfilerEventsMainView::nameForType(binding->eventType))); + QString typeString = QmlProfilerEventsMainView::nameForType(binding->eventType); + QString toolTipText; + if (binding->eventType == Binding && binding->bindingType == (int)V4Binding) { + typeString = typeString + tr(" (v4)"); + toolTipText = qsTr("Binding is evaluated by the optimized v4 engine."); + } + newRow << new EventsViewItem(typeString); + newRow.last()->setData(QVariant(typeString)); + if (!toolTipText.isEmpty()) + newRow.last()->setToolTip(toolTipText); } if (m_fieldShown[Percent]) { |