Enabled the use of Debugger-specific watch/locals models.

- Modified WatchModel to handle storage of an hierarchy
  of WatchItems.
- Factored out code for asynchronous population to
  AsyncWatchModel and added a mixin for convenient
  handling
- Added base class for synchronous models.
- Implement simple, synchronous models for CDB, greatly
  simplifying code and finally getting manual
  expansion right.
Signed-off-by: hjk <qtc-committer@nokia.com>

src/plugins/debugger/script/scriptengine.h

@@ -49,6 +49,7 @@ class QScriptValue;
 QT_END_NAMESPACE
 
 #include "idebuggerengine.h"
+#include "asyncwatchmodel.h"
 
 namespace Debugger {
 namespace Internal {
@@ -107,14 +108,20 @@ private:
 
     bool supportsThreads() const { return true; }
     void maybeBreakNow(bool byFunction);
-    void updateWatchData(const WatchData &data);
+
     void updateLocals();
     void updateSubItem(const WatchData &data);
 
+    WatchModel *watchModel(int type) const { return m_models.model(type); }
+
+private slots:
+    void updateWatchData(const WatchData &data);
+
 private:
     friend class ScriptAgent;
     DebuggerManager *q;
     IDebuggerManagerAccessForEngines *qq;
+    AsyncWatchModelMixin m_models;
 
     QScriptEngine *m_scriptEngine;
     QString m_scriptContents;