Commit f08e42f9 authored by Christian Kandeler's avatar Christian Kandeler

Maemo: Fix QML debugging.

In general, at least. Does not actually stop at breakpoints yet.
parent ef800d29
......@@ -197,7 +197,7 @@ void QmlEngine::setupInferior()
QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
if (startParameters().startMode == AttachToRemote) {
requestRemoteSetup();
emit requestRemoteSetup();
} else {
connect(&d->m_applicationLauncher,
SIGNAL(processExited(int)),
......@@ -311,10 +311,11 @@ void QmlEngine::stopApplicationLauncher()
}
}
void QmlEngine::handleRemoteSetupDone(int port)
void QmlEngine::handleRemoteSetupDone(int gdbServerPort, int qmlPort)
{
if (port != -1)
startParameters().qmlServerPort = port;
Q_UNUSED(gdbServerPort);
if (qmlPort != -1)
startParameters().qmlServerPort = qmlPort;
notifyInferiorSetupOk();
}
......
......@@ -55,7 +55,7 @@ public:
DebuggerEngine *masterEngine);
~QmlEngine();
void handleRemoteSetupDone(int port);
void handleRemoteSetupDone(int gdbServerPort, int qmlPort);
void handleRemoteSetupFailed(const QString &message);
void gotoLocation(const Location &location);
......@@ -66,9 +66,6 @@ public slots:
void messageReceived(const QByteArray &message);
void disconnected();
signals:
void remoteStartupRequested();
private:
// DebuggerEngine implementation.
bool isSynchronous() const { return false; }
......
......@@ -285,6 +285,10 @@ void MaemoDebugSupport::startDebugging()
SLOT(handleRemoteErrorOutput(QByteArray)));
connect(m_runner, SIGNAL(remoteOutput(QByteArray)), this,
SLOT(handleRemoteOutput(QByteArray)));
if (m_debuggingType == MaemoRunConfiguration::DebugQmlOnly) {
connect(m_runner, SIGNAL(remoteProcessStarted()),
SLOT(handleRemoteProcessStarted()));
}
const QString &remoteExe = m_runner->remoteExecutable();
const QString cmdPrefix = MaemoGlobal::remoteCommandPrefix(remoteExe);
const QString env = MaemoGlobal::remoteEnvironment(m_userEnvChanges);
......@@ -350,6 +354,13 @@ void MaemoDebugSupport::handleAdapterSetupDone()
m_engine->handleRemoteSetupDone(m_gdbServerPort, m_qmlPort);
}
void MaemoDebugSupport::handleRemoteProcessStarted()
{
Q_ASSERT(m_debuggingType == MaemoRunConfiguration::DebugQmlOnly);
ASSERT_STATE(StartingRemoteProcess);
handleAdapterSetupDone();
}
void MaemoDebugSupport::setState(State newState)
{
if (m_state == newState)
......
......@@ -82,6 +82,7 @@ private slots:
void handleRemoteOutput(const QByteArray &output);
void handleRemoteErrorOutput(const QByteArray &output);
void handleProgressReport(const QString &progressOutput);
void handleRemoteProcessStarted();
private:
enum State {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment