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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	share/qtcreator/debugger/stdtypes.py
	src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp

Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
This commit is contained in:
Eike Ziller
2013-12-18 11:02:16 +01:00
parent fca56658bb 1193cfa092
commit e035ae6df1
62 changed files with 552 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp
View File

@@ -96,11 +96,10 @@ void QmlProfilerEventsModelProxy::limitToRange(qint64 rangeStart, qint64 rangeEn
void QmlProfilerEventsModelProxy::dataChanged()
{
if (d->modelManager->state() == QmlProfilerDataState::ProcessingData)
loadData();
if (d->modelManager->state() == QmlProfilerDataState::ClearingData)
clear();
else
loadData();
}
QSet<QString> QmlProfilerEventsModelProxy::eventsInBindingLoop() const

6
src/plugins/qmlprofiler/qmlprofilerprocessedmodel.cpp
View File

@@ -114,9 +114,10 @@ QmlProfilerProcessedModel::~QmlProfilerProcessedModel()
void QmlProfilerProcessedModel::clear()
{
m_detailsRewriter->clearRequests();
// This call emits changed(). Don't emit it again here.
QmlProfilerSimpleModel::clear();
emit changed();
m_emitChanged = false;
}
@@ -155,8 +156,9 @@ void QmlProfilerProcessedModel::complete()
m_detailsRewriter->reloadDocuments();
// This call emits changed(). Don't emit it again here.
QmlProfilerSimpleModel::complete();
emit changed();
m_emitChanged = false;
}