Merge QML inspector into debugger plugin

Merge QmlJSInspector plugin into the debugger. Also merge the
extra Inspector window with the Locals & Watchers: It now shows
the QML object tree in the running state.

Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2012-04-18 14:20:54 +02:00
parent d201c681da
commit 7f09d0b756
80 changed files with 2669 additions and 5187 deletions

View File

@@ -55,7 +55,8 @@ enum WatchType
ReturnWatch,
LocalsWatch,
WatchersWatch,
TooltipsWatch
TooltipsWatch,
InspectWatch
};
enum IntegerFormat
@@ -78,6 +79,9 @@ public:
virtual int rowCount(const QModelIndex &idx = QModelIndex()) const;
virtual int columnCount(const QModelIndex &idx) const;
signals:
void setCurrentIndex(const QModelIndex &index);
private:
QVariant data(const QModelIndex &index, int role) const;
bool setData(const QModelIndex &index, const QVariant &value, int role);
@@ -131,6 +135,7 @@ private:
DebuggerEngine *engine() const;
QString display(const WatchItem *item, int col) const;
int itemFormat(const WatchData &data) const;
bool contentIsValid() const;
int m_generationCounter;
WatchHandler *m_handler;
@@ -157,6 +162,10 @@ public:
void beginCycle(bool fullCycle = true); // Called at begin of updateLocals() cycle
void updateWatchers(); // Called after locals are fetched
void endCycle(); // Called after all results have been received
void beginCycle(WatchType type, bool fullCycle = true);
void endCycle(WatchType type);
void showEditValue(const WatchData &data);
void insertData(const WatchData &data);
@@ -204,6 +213,8 @@ public:
void resetLocation();
bool isValidToolTip(const QByteArray &iname) const;
void setCurrentModelIndex(WatchType modelType, const QModelIndex &index);
private:
friend class WatchModel;
@@ -230,6 +241,7 @@ private:
WatchModel *m_locals;
WatchModel *m_watchers;
WatchModel *m_tooltips;
WatchModel *m_inspect;
DebuggerEngine *m_engine;
int m_watcherCounter;