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

QML Debugger: fix the fact that the qmlobserver would only run once.

Browse Source
This commit is contained in:
Olivier Goffart
2010-08-10 14:42:44 +02:00
parent fe3bfad766
commit d75239aeab
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,9 +126,7 @@ void QmlEngine::shutdownInferior()
void QmlEngine::shutdownEngine() void QmlEngine::shutdownEngine()
{ {
QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state()); QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
//m_objectTreeWidget->saveSettings(m_settings); notifyEngineShutdownOk();
//m_propertiesWidget->saveSettings(m_settings);
//m_settings.saveSettings(Core::ICore::instance()->settings());
} }
const int serverPort = 3768; const int serverPort = 3768;
@@ -138,7 +136,6 @@ void QmlEngine::setupEngine()
notifyEngineSetupOk(); notifyEngineSetupOk();
} }
void QmlEngine::continueInferior() void QmlEngine::continueInferior()
{ {
QTC_ASSERT(state() == InferiorStopOk, qDebug() << state()); QTC_ASSERT(state() == InferiorStopOk, qDebug() << state());
@@ -518,6 +515,12 @@ void QmlEngine::messageReceived(const QByteArray &message)
} }
void QmlEngine::disconnected()
{
notifyInferiorExited();
}
} // namespace Internal } // namespace Internal
} // namespace Debugger } // namespace Debugger

2
src/plugins/debugger/qml/qmlengine.h
View File

@@ -62,7 +62,9 @@ public:
explicit QmlEngine(const DebuggerStartParameters &startParameters); explicit QmlEngine(const DebuggerStartParameters &startParameters);
~QmlEngine(); ~QmlEngine();
public slots:
void messageReceived(const QByteArray &message); void messageReceived(const QByteArray &message);
void disconnected();
private: private:
// DebuggerEngine implementation // DebuggerEngine implementation

1
src/plugins/qmljsinspector/qmljsdebuggerclient.cpp
View File

@@ -55,6 +55,7 @@ DebuggerClient::DebuggerClient(QDeclarativeDebugConnection* client)
//engine->startSuccessful(); // FIXME: AAA: port to new debugger states //engine->startSuccessful(); // FIXME: AAA: port to new debugger states
connect(engine, SIGNAL(sendMessage(QByteArray)), this, SLOT(slotSendMessage(QByteArray))); connect(engine, SIGNAL(sendMessage(QByteArray)), this, SLOT(slotSendMessage(QByteArray)));
connect(connection, SIGNAL(disconnected()), engine, SLOT(disconnected()));
setEnabled(true); setEnabled(true);
} }