From 896e898369a41c378cb03f7e4be8df36569698dc Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Thu, 8 Jul 2010 17:27:23 +0200
Subject: [PATCH] debugger: comment out the code that runs the qmlviewer from
QMLEngine
the qmlviewer is currently started from the qmljsinspector.
But this might change in the future
---
src/plugins/debugger/qml/qmlengine.cpp | 13 +++++++++----
src/plugins/debugger/qml/qmlengine.h | 1 +
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 5960acdbb4f..4194733461c 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -81,7 +81,6 @@
namespace Debugger {
namespace Internal {
-
class QmlResponse
{
public:
@@ -93,7 +92,6 @@ public:
QByteArray data;
};
-
///////////////////////////////////////////////////////////////////////
//
// QmlDebuggerClient
@@ -156,7 +154,6 @@ public:
};
-
///////////////////////////////////////////////////////////////////////
//
// QmlEngine
@@ -228,6 +225,7 @@ const int serverPort = 3768;
void QmlEngine::startEngine()
{
+ #if 0
QTC_ASSERT(state() == EngineStarting, qDebug() << state());
const DebuggerStartParameters &sp = startParameters();
const int pos = sp.remoteChannel.indexOf(QLatin1Char(':'));
@@ -257,16 +255,19 @@ void QmlEngine::startEngine()
startFailed();
return;
}
+#endif
setState(EngineStarted);
startSuccessful();
setState(InferiorStarting);
//m_frameRate = new CanvasFrameRate(0);
//m_frameRate->show();
+ setState(InferiorRunning);
}
void QmlEngine::setupConnection()
{
+ #if 0 //the qmlviewer right now connected using QmlJSInspector::InternalInspectorPlugin::ClientProxy
QTC_ASSERT(m_conn == 0, /**/);
m_conn = new QDeclarativeDebugConnection(this);
@@ -303,12 +304,14 @@ void QmlEngine::setupConnection()
startFailed();
return;
}
+ #endif
qDebug() << "CONNECTION SUCCESSFUL";
setState(InferiorRunningRequested);
setState(InferiorRunning);
- reloadEngines();
+// reloadEngines();
+
}
void QmlEngine::continueInferior()
@@ -454,11 +457,13 @@ void QmlEngine::requestModuleSymbols(const QString &moduleName)
Q_UNUSED(moduleName)
}
+#if 0 //this is currently a signal connected to the QmlJSInspector::Internal::DebuggerClient
void QmlEngine::sendMessage(const QByteArray &msg)
{
QTC_ASSERT(m_client, return);
m_client->sendMessage(msg);
}
+#endif
//////////////////////////////////////////////////////////////////////
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index abcd335439e..f628634b566 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -124,6 +124,7 @@ private:
unsigned int debuggerCapabilities() const;
void setupConnection();
+signals:
void sendMessage(const QByteArray &msg);
private slots:
--
GitLab