Skip to content
Snippets Groups Projects
Commit 896e8983 authored by Olivier Goffart's avatar Olivier Goffart
Browse files

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
parent 846a60df
No related branches found
No related tags found
No related merge requests found
...@@ -81,7 +81,6 @@ ...@@ -81,7 +81,6 @@
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
class QmlResponse class QmlResponse
{ {
public: public:
...@@ -93,7 +92,6 @@ public: ...@@ -93,7 +92,6 @@ public:
QByteArray data; QByteArray data;
}; };
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
// //
// QmlDebuggerClient // QmlDebuggerClient
...@@ -156,7 +154,6 @@ public: ...@@ -156,7 +154,6 @@ public:
}; };
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
// //
// QmlEngine // QmlEngine
...@@ -228,6 +225,7 @@ const int serverPort = 3768; ...@@ -228,6 +225,7 @@ const int serverPort = 3768;
void QmlEngine::startEngine() void QmlEngine::startEngine()
{ {
#if 0
QTC_ASSERT(state() == EngineStarting, qDebug() << state()); QTC_ASSERT(state() == EngineStarting, qDebug() << state());
const DebuggerStartParameters &sp = startParameters(); const DebuggerStartParameters &sp = startParameters();
const int pos = sp.remoteChannel.indexOf(QLatin1Char(':')); const int pos = sp.remoteChannel.indexOf(QLatin1Char(':'));
...@@ -257,16 +255,19 @@ void QmlEngine::startEngine() ...@@ -257,16 +255,19 @@ void QmlEngine::startEngine()
startFailed(); startFailed();
return; return;
} }
#endif
setState(EngineStarted); setState(EngineStarted);
startSuccessful(); startSuccessful();
setState(InferiorStarting); setState(InferiorStarting);
//m_frameRate = new CanvasFrameRate(0); //m_frameRate = new CanvasFrameRate(0);
//m_frameRate->show(); //m_frameRate->show();
setState(InferiorRunning);
} }
void QmlEngine::setupConnection() void QmlEngine::setupConnection()
{ {
#if 0 //the qmlviewer right now connected using QmlJSInspector::InternalInspectorPlugin::ClientProxy
QTC_ASSERT(m_conn == 0, /**/); QTC_ASSERT(m_conn == 0, /**/);
m_conn = new QDeclarativeDebugConnection(this); m_conn = new QDeclarativeDebugConnection(this);
...@@ -303,12 +304,14 @@ void QmlEngine::setupConnection() ...@@ -303,12 +304,14 @@ void QmlEngine::setupConnection()
startFailed(); startFailed();
return; return;
} }
#endif
qDebug() << "CONNECTION SUCCESSFUL"; qDebug() << "CONNECTION SUCCESSFUL";
setState(InferiorRunningRequested); setState(InferiorRunningRequested);
setState(InferiorRunning); setState(InferiorRunning);
reloadEngines(); // reloadEngines();
} }
void QmlEngine::continueInferior() void QmlEngine::continueInferior()
...@@ -454,11 +457,13 @@ void QmlEngine::requestModuleSymbols(const QString &moduleName) ...@@ -454,11 +457,13 @@ void QmlEngine::requestModuleSymbols(const QString &moduleName)
Q_UNUSED(moduleName) Q_UNUSED(moduleName)
} }
#if 0 //this is currently a signal connected to the QmlJSInspector::Internal::DebuggerClient
void QmlEngine::sendMessage(const QByteArray &msg) void QmlEngine::sendMessage(const QByteArray &msg)
{ {
QTC_ASSERT(m_client, return); QTC_ASSERT(m_client, return);
m_client->sendMessage(msg); m_client->sendMessage(msg);
} }
#endif
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
......
...@@ -124,6 +124,7 @@ private: ...@@ -124,6 +124,7 @@ private:
unsigned int debuggerCapabilities() const; unsigned int debuggerCapabilities() const;
void setupConnection(); void setupConnection();
signals:
void sendMessage(const QByteArray &msg); void sendMessage(const QByteArray &msg);
private slots: private slots:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment