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: (64 commits)
  More renaming: MouseRegion -> MouseArea
  Save secondary scope inside the expression's scope object
  'on' syntax fixes
  QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject property
  Move JS global scope to top of the QML scope chain
  Add documentation for the 'when' property of Binding.
  Auto test for QTBUG-8677
  QDeclarativeGuard should handle objects being deleted
  OS-friendlier, less noisy.
  fix crash, re-enable settings test
  Fix incorrect scope resolution for script in a script block.
  Disable until plugin objects problem resolved.
  silence debuggery
  add colorbrowser qml example
  Fix settings (was not exported type).
  Add import Qt.widgets 4.6 to layout.qml example
  make runnable from elsewhere
  remove debugger
  runnable from elsewhere
  Ensure error is received - the root object is INITIALLY zero.
  ...

0 files changed, 0 insertions, 0 deletions