forked from qt-creator/qt-creator
Delegate javascript debugging to Script and V8 debugger clients.
The appropriate client handles the debugging based on the service available at the server side. Change-Id: I46b66036f700fc7e45e8b38cef7f1ce1445b1122 Reviewed-on: http://codereview.qt.nokia.com/2497 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
@@ -49,6 +49,11 @@ class QmlEngine : public DebuggerEngine
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
enum LogDirection {
|
||||
LogSend,
|
||||
LogReceive
|
||||
};
|
||||
|
||||
QmlEngine(const DebuggerStartParameters &startParameters,
|
||||
DebuggerEngine *masterEngine);
|
||||
~QmlEngine();
|
||||
@@ -62,9 +67,12 @@ public:
|
||||
int timeout = -1) const;
|
||||
void filterApplicationMessage(const QString &msg, int channel);
|
||||
virtual bool acceptsWatchesWhileRunning() const;
|
||||
QString toFileInProject(const QUrl &fileUrl);
|
||||
void inferiorSpontaneousStop();
|
||||
|
||||
void logMessage(LogDirection direction, const QString &str);
|
||||
|
||||
public slots:
|
||||
void messageReceived(const QByteArray &message);
|
||||
void disconnected();
|
||||
|
||||
private slots:
|
||||
@@ -120,7 +128,6 @@ private:
|
||||
unsigned int debuggerCapabilities() const;
|
||||
|
||||
signals:
|
||||
void sendMessage(const QByteArray &msg);
|
||||
void tooltipRequested(const QPoint &mousePos,
|
||||
TextEditor::ITextEditor *editor, int cursorPos);
|
||||
|
||||
@@ -135,9 +142,6 @@ private slots:
|
||||
void synchronizeWatchers();
|
||||
|
||||
private:
|
||||
void expandObject(const QByteArray &iname, quint64 objectId);
|
||||
void sendPing();
|
||||
|
||||
void closeConnection();
|
||||
void startApplicationLauncher();
|
||||
void stopApplicationLauncher();
|
||||
@@ -148,13 +152,6 @@ private:
|
||||
const QString &oldBasePath, const QString &newBasePath) const;
|
||||
QString qmlImportPath() const;
|
||||
|
||||
enum LogDirection {
|
||||
LogSend,
|
||||
LogReceive
|
||||
};
|
||||
void logMessage(LogDirection direction, const QString &str);
|
||||
QString toFileInProject(const QUrl &fileUrl);
|
||||
|
||||
private:
|
||||
friend class QmlCppEngine;
|
||||
QmlEnginePrivate *d;
|
||||
|
||||
Reference in New Issue
Block a user