Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (76 commits)
  Qt.Infinite -> Animation.Infinite
  Doc fix.
  Skip tests for now
  Make autotest work on windows.
  Remove faulty assert - the precondition is checked for correctly later on
  Ensure currentIndex is updated when items inserted before currentIndex
  Replace Animation's repeat property with loops.
  Fix compile in namespace.
  Compile with qtnamespace
  Disallow the implicit QDeclarativeGuardedContextData copy constructor
  Doc
  Fix leak.
  StateChangeScript doc.
  A StateChangeScript should never be run when leaving the state.
  ScriptAction doc.
  Rename stateChangeScriptName to scriptName.
  Doc
  Document QML security considerations.
  Fix flicking views at boundary with StricthighlighRange
  Fix abort in flipable
  ...

1 files changed, 2 insertions, 0 deletions

diff --git a/src/declarative/debugger/qdeclarativedebug_p.h b/src/declarative/debugger/qdeclarativedebug_p.h
index f0c7a77..4ead232 100644
--- a/src/declarative/debugger/qdeclarativedebug_p.h
+++ b/src/declarative/debugger/qdeclarativedebug_p.h
@@ -230,6 +230,7 @@ public:
 
     int debugId() const;
     QString className() const;
+    QString idString() const;
     QString name() const;
 
     QDeclarativeDebugFileReference source() const;
@@ -242,6 +243,7 @@ private:
     friend class QDeclarativeEngineDebugPrivate;
     int m_debugId;
     QString m_class;
+    QString m_idString;
     QString m_name;
     QDeclarativeDebugFileReference m_source;
     int m_contextDebugId;