summaryrefslogtreecommitdiffstats
path: root/tests/auto/qxml
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-25 14:10:23 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-25 14:10:23 (GMT)
commit20aba4ffa2fdf7a7306424981049d430f7d88e5c (patch)
treee30e2351dab3d57e468462b45d53f40ce1e39f43 /tests/auto/qxml
parent39a1a94bfdb7878afb351101aead2fbdcc871a25 (diff)
parent8eaeb1d4415d19a43b20fffe46c2b29fd609bba1 (diff)
downloadQt-20aba4ffa2fdf7a7306424981049d430f7d88e5c.zip
Qt-20aba4ffa2fdf7a7306424981049d430f7d88e5c.tar.gz
Qt-20aba4ffa2fdf7a7306424981049d430f7d88e5c.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert changes made in scroll_sys(). Add benchmarks for accessing meta-object properties via QScriptValue
Diffstat (limited to 'tests/auto/qxml')
0 files changed, 0 insertions, 0 deletions