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

Merge remote-tracking branch 'origin/2.7' into 2.8

Browse Source 
Conflicts:
	src/libs/cplusplus/LookupContext.cpp
	src/plugins/plugins.pro
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qnx/qnx_dependencies.pri

Change-Id: I6c406c2503845b08c4852db99c64491a325629c7
This commit is contained in:
Eike Ziller
2013-06-26 15:28:42 +02:00
parent f40c50c61b c219a5b514
commit 22e31f2b45
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,6 +262,10 @@ void QmlProfilerEngine::cancelProcess()
{
QTC_ASSERT(d->m_profilerState, return);
// no process to be canceled? (there might be multiple engines, but only one runs a process)
if (!d->m_runner)
return;
switch (d->m_profilerState->currentState()) {
case QmlProfilerStateManager::AppReadyToStop : {
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppStopped);