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

Merge remote-tracking branch 'origin/2.3'

Browse Source 
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
This commit is contained in:
Eike Ziller
2011-08-10 16:03:57 +02:00
parent 01bb7443fd d78d7dbce3
commit 99ba300ae3
140 changed files with 1585 additions and 1298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmlprofiler/qmlprofilerengine.cpp
View File

@@ -318,7 +318,8 @@ void QmlProfilerEngine::wrongSetupMessageBoxFinished(int button)
{
if (button == QMessageBox::Help) {
Core::HelpManager *helpManager = Core::HelpManager::instance();
helpManager->handleHelpRequest("qthelp://com.nokia.qtcreator/doc/creator-qml-performance-monitor.html");
helpManager->handleHelpRequest("qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html"
"#setting-up-qml-debugging");
}
}

2
src/plugins/qmlprofiler/qmlprofilereventview.cpp
View File

@@ -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]) {