Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 12 Oct 2011 00:07:57 +0000 (10:07 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 12 Oct 2011 00:07:57 +0000 (10:07 +1000)
commitc9b2dc28d831f93e9e58dc11209171cebbdaf8f6
tree61a22922989599bb4faf318b5233267737157cde
parentea99fab06a9c2365bcd992681fe682af98cb4c4b
parent3f42986b357c5066adb9755454bc4bcc4915ab9f
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:
  Backport more imports directory caching changes.
  Fix more test DEPLOYMENT statements for Symbian
  Fix deployment for declarative tests, examples on Symbian
  Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
  Backport imports directory caching performance optimization
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/qml/qdeclarativeimport.cpp