summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-08 12:34:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-08 12:34:17 (GMT)
commit3110c9349503c2389f6aa4bcbfb78b28966549f1 (patch)
tree32fa1b927fea9d7c5592b25e8b02a3972d4ce76e /src/dbus
parent8c6c53e9c72c36ec02090e590af68c5f5eb85801 (diff)
parent1830535a87245b611f6630dc0ce5848bfd41d075 (diff)
downloadQt-3110c9349503c2389f6aa4bcbfb78b28966549f1.zip
Qt-3110c9349503c2389f6aa4bcbfb78b28966549f1.tar.gz
Qt-3110c9349503c2389f6aa4bcbfb78b28966549f1.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add average frame timing to QDeclarativeView, ifdef'ed out.
Diffstat (limited to 'src/dbus')
0 files changed, 0 insertions, 0 deletions