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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Conflicts:
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I726babe61e28db14d06a6a1a5c570e148745b458
This commit is contained in:
Eike Ziller
2017-11-09 14:04:45 +01:00
parent e5d832f2cc 1bb6ebd5a0
commit b05637131c
32 changed files with 12890 additions and 13115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -457,7 +457,7 @@ void QmlCppEngine::slaveEngineStateChanged
break;
}
case EngineSetupFailed: {
qmlEngine()->quitDebugger();
m_qmlEngine->quitDebugger();
notifyEngineSetupFailed();
break;
}
@@ -471,7 +471,7 @@ void QmlCppEngine::slaveEngineStateChanged
break;
}
case InferiorSetupFailed: {
qmlEngine()->quitDebugger();
m_qmlEngine->quitDebugger();
notifyInferiorSetupFailed();
break;
}
@@ -484,12 +484,12 @@ void QmlCppEngine::slaveEngineStateChanged
break;
}
case EngineRunFailed: {
qmlEngine()->quitDebugger();
m_qmlEngine->quitDebugger();
notifyEngineRunFailed();
break;
}
case InferiorUnrunnable: {
qmlEngine()->quitDebugger();
m_qmlEngine->quitDebugger();
notifyEngineRunOkAndInferiorUnrunnable();
break;
}
@@ -509,7 +509,7 @@ void QmlCppEngine::slaveEngineStateChanged
else
QTC_ASSERT(false, qDebug() << state());
if (qmlEngine()->state() == InferiorStopOk) {
if (m_qmlEngine->state() == InferiorStopOk) {
// track qml engine again
setState(InferiorStopRequested);
notifyInferiorStopOk();
@@ -518,7 +518,7 @@ void QmlCppEngine::slaveEngineStateChanged
break;
}
case InferiorRunFailed: {
qmlEngine()->quitDebugger();
m_qmlEngine->quitDebugger();
notifyInferiorRunFailed();
break;
}
@@ -605,7 +605,7 @@ void QmlCppEngine::slaveEngineStateChanged
// might be set by queueShutdownInferior() already
CHECK_STATE(InferiorShutdownRequested);
}
qmlEngine()->quitDebugger();
m_qmlEngine->quitDebugger();
break;
}
case InferiorShutdownFailed: {
@@ -656,7 +656,7 @@ void QmlCppEngine::slaveEngineStateChanged
notifyInferiorStopOk();
// otherwise we're probably inside notifyInferiorStopOk already
} else {
if (m_activeEngine != qmlEngine()) {
if (m_activeEngine != m_qmlEngine) {
showStatusMessage(tr("QML debugger activated"));
setActiveEngine(m_qmlEngine);
}
@@ -670,7 +670,7 @@ void QmlCppEngine::slaveEngineStateChanged
}
} else if (newState == InferiorRunOk) {
if (m_activeEngine == qmlEngine()) {
if (m_activeEngine == m_qmlEngine) {
CHECK_STATE(InferiorRunRequested);
notifyInferiorRunOk();
}
@@ -700,11 +700,6 @@ void QmlCppEngine::debugLastCommand()
m_cppEngine->debugLastCommand();
}
DebuggerEngine *QmlCppEngine::qmlEngine() const
{
return m_qmlEngine;
}
void QmlCppEngine::setRunTool(DebuggerRunTool *runTool)
{
DebuggerEngine::setRunTool(runTool);

1
src/plugins/debugger/qml/qmlcppengine.h
View File

@@ -79,7 +79,6 @@ public:
const QString &expr, const QVariant &value) override;
DebuggerEngine *cppEngine() override { return m_cppEngine; }
DebuggerEngine *qmlEngine() const;
DebuggerEngine *activeEngine() override { return m_activeEngine; }
void setRunTool(DebuggerRunTool *runTool) override;

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

@@ -87,6 +87,7 @@
# define XSDEBUG(s) qDebug() << s
#define CB(callback) [this](const QVariantMap &r) { callback(r); }
#define CHECK_STATE(s) do { checkState(s, __FILE__, __LINE__); } while (0)
using namespace Core;
using namespace ProjectExplorer;
@@ -559,6 +560,7 @@ void QmlEngine::stopApplicationLauncher()
void QmlEngine::shutdownInferior()
{
CHECK_STATE(InferiorShutdownRequested);
// End session.
// { "seq" : <number>,
// "type" : "request",
@@ -1030,7 +1032,8 @@ void QmlEngine::quitDebugger()
{
d->automaticConnect = false;
d->retryOnConnectFail = false;
shutdownInferior();
stopApplicationLauncher();
closeConnection();
}
void QmlEngine::doUpdateLocals(const UpdateParameters &params)