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>
Fri, 7 Jan 2011 11:04:43 +0000 (21:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 7 Jan 2011 11:04:43 +0000 (21:04 +1000)
commit2f2837888324b6d75ac1be170790772d1fcf5f17
tree70b07490cdaab40367e548766d36a07c1ad4f0a1
parentb71a43deb870352aa647c395e6bb02d9f20f50e5
parent5780ff75c1e63322f3edd6158c08f1d944919cce
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:
  QmlViewer: Remove unused class variables