Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 4 Oct 2011 08:25:11 +0000 (18:25 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 4 Oct 2011 08:25:11 +0000 (18:25 +1000)
commit8b610c28c1300e0aa800569225d8512d0b66ffce
tree099f2a89f86bb194a6c6352ce92fee7e877956a2
parentebfe394f21174b2ab1c37e809d2c35eb0de84508
parent739e705150ad114eb92a1fac34a51d30322ffc31
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjs
  Fix assert
  Compile fix for Symbian
  Debugger: Fix autotest breakage
  Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*
  Rename QDeclarativeEngineDebugServer to ~Service
  Fix aliasing bug when compiled with gcc 4.6
  Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.h
  FocusScope's focusItem must always be a descendent
  QDeclarativeDebugJs: Disable unstable autotest
  Add qdeclarativedebugjs autotests to declarative.pro
  tests: Use CONFIG option instead of QDeclarativeDebugHelper class