forked from qt-creator/qt-creator
Debugger: Fix Qml debugger rampdown when not fully started
Fixes: QTCREATORBUG-30355 Change-Id: I3e7c1ef56db1fe48f5b571d21f89d20b7936cfb7 Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
@@ -208,7 +208,6 @@ public:
|
|||||||
bool unpausedEvaluate = false;
|
bool unpausedEvaluate = false;
|
||||||
bool contextEvaluate = false;
|
bool contextEvaluate = false;
|
||||||
bool supportChangeBreakpoint = false;
|
bool supportChangeBreakpoint = false;
|
||||||
bool hasQuit = false;
|
|
||||||
|
|
||||||
QTimer connectionTimer;
|
QTimer connectionTimer;
|
||||||
QmlDebug::QDebugMessageClient *msgClient = nullptr;
|
QmlDebug::QDebugMessageClient *msgClient = nullptr;
|
||||||
@@ -380,7 +379,7 @@ void QmlEngine::beginConnection()
|
|||||||
|
|
||||||
void QmlEngine::connectionStartupFailed()
|
void QmlEngine::connectionStartupFailed()
|
||||||
{
|
{
|
||||||
if (d->hasQuit)
|
if (isDying())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (d->retryOnConnectFail) {
|
if (d->retryOnConnectFail) {
|
||||||
@@ -502,8 +501,7 @@ void QmlEngine::startProcess()
|
|||||||
|
|
||||||
void QmlEngine::stopProcess()
|
void QmlEngine::stopProcess()
|
||||||
{
|
{
|
||||||
if (d->process.isRunning())
|
d->process.close();
|
||||||
d->process.close();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void QmlEngine::shutdownInferior()
|
void QmlEngine::shutdownInferior()
|
||||||
@@ -937,15 +935,6 @@ bool QmlEngine::hasCapability(unsigned cap) const
|
|||||||
| AddWatcherCapability;*/
|
| AddWatcherCapability;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
void QmlEngine::quitDebugger()
|
|
||||||
{
|
|
||||||
d->automaticConnect = false;
|
|
||||||
d->retryOnConnectFail = false;
|
|
||||||
d->hasQuit = true;
|
|
||||||
stopProcess();
|
|
||||||
closeConnection();
|
|
||||||
}
|
|
||||||
|
|
||||||
void QmlEngine::doUpdateLocals(const UpdateParameters ¶ms)
|
void QmlEngine::doUpdateLocals(const UpdateParameters ¶ms)
|
||||||
{
|
{
|
||||||
d->updateLocals(params.qmlFocusOnFrame);
|
d->updateLocals(params.qmlFocusOnFrame);
|
||||||
|
@@ -91,7 +91,6 @@ private:
|
|||||||
|
|
||||||
bool companionPreventsActions() const override;
|
bool companionPreventsActions() const override;
|
||||||
bool hasCapability(unsigned) const override;
|
bool hasCapability(unsigned) const override;
|
||||||
void quitDebugger() override;
|
|
||||||
|
|
||||||
void doUpdateLocals(const UpdateParameters ¶ms) override;
|
void doUpdateLocals(const UpdateParameters ¶ms) override;
|
||||||
Core::Context languageContext() const override;
|
Core::Context languageContext() const override;
|
||||||
|
Reference in New Issue
Block a user