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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggeritem.cpp
	tests/unit/unittest/unittest.pro

Change-Id: Id2e4e9c2bc87b2556d7c2845aea3fe2fa11b630b
This commit is contained in:
Eike Ziller
2018-10-22 09:53:54 +02:00
parent 16de556c86 1cad74a7d4
commit 95db30bd3a
151 changed files with 2927 additions and 1910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -610,15 +610,7 @@ void QmlEngine::interruptInferior()
showStatusMessage(tr("Waiting for JavaScript engine to interrupt on next statement."));
}
void QmlEngine::executeStep()
{
clearExceptionSelection();
d->continueDebugging(StepIn);
notifyInferiorRunRequested();
notifyInferiorRunOk();
}
void QmlEngine::executeStepI()
void QmlEngine::executeStepIn(bool)
{
clearExceptionSelection();
d->continueDebugging(StepIn);
@@ -634,7 +626,7 @@ void QmlEngine::executeStepOut()
notifyInferiorRunOk();
}
void QmlEngine::executeNext()
void QmlEngine::executeStepOver(bool)
{
clearExceptionSelection();
d->continueDebugging(Next);
@@ -642,11 +634,6 @@ void QmlEngine::executeNext()
notifyInferiorRunOk();
}
void QmlEngine::executeNextI()
{
executeNext();
}
void QmlEngine::executeRunToLine(const ContextData &data)
{
QTC_ASSERT(state() == InferiorStopOk, qDebug() << state());