diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-08-10 16:03:57 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-08-10 16:03:57 +0200 |
| commit | 99ba300ae3ab8776a39a987dc45c9c7afe75b493 (patch) | |
| tree | f1389a0980ecd0a549ebcccc54600c3ae04d6f06 /src/plugins/qmlprofiler/qmlprofilereventview.cpp | |
| parent | 01bb7443fdb848899fef41e9f661a455e2e6e4ee (diff) | |
| parent | d78d7dbce3d4a85e7f111db719dde0b943814575 (diff) | |
| download | qt-creator-99ba300ae3ab8776a39a987dc45c9c7afe75b493.tar.gz | |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
src/libs/libs.pro
src/plugins/debugger/watchwindow.cpp
src/plugins/remotelinux/maemopackagecreationstep.h
Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilereventview.cpp')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilereventview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp index aa97693774..28de7cb49e 100644 --- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp @@ -450,7 +450,7 @@ void QmlProfilerEventsView::QmlProfilerEventsViewPrivate::buildModelFromList( co if (m_fieldShown[Type]) { newRow << new EventsViewItem(nameForType(binding->eventType)); - newRow.last()->setData(QVariant(binding->eventType)); + newRow.last()->setData(QVariant(nameForType(binding->eventType))); } if (m_fieldShown[Percent]) { |