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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/servermodereader.cpp

Change-Id: I58e7b33d32c41cb48a24a5638ddb256212dd6107
This commit is contained in:
Eike Ziller
2017-03-30 13:59:12 +02:00
parent 61b6aa5c84 5afc149b69
commit bac2e6c17a
71 changed files with 798 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
View File

@@ -511,7 +511,6 @@ void QmlProfilerModelManager::processingDone()
++d->numFinishedFinalizers;
}
d->notesModel->loadData();
setState(Done);
}

1
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
View File

@@ -108,6 +108,7 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag
case QmlProfilerModelManager::Empty:
d->m_modelProxy->setModels(d->m_suspendedModels);
d->m_suspendedModels.clear();
d->m_modelManager->notesModel()->loadData();
break;
case QmlProfilerModelManager::ProcessingData:
break;