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, 1 Jun 2011 15:38:43 +0000 (01:38 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 1 Jun 2011 15:38:43 +0000 (01:38 +1000)
commite9ab8493053a7dd56cde058e736f46feafb378d0
treea4222a567646a7661b76b62dac6675e6a5b86f23
parent06db44a5d521fe6238e39c9846f7cb2d43b43eb0
parentf8d71ee8c5f29eabb759ff4b0d5c8a153023a254
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:
  QDeclarative: Fix QPerformanceTimer on Symbian
src/declarative/qml/qperformancetimer.cpp