summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-14 01:20:24 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-14 01:20:24 (GMT)
commit0def696a8d569f0895010706fb989e78b25c13c1 (patch)
tree56834f2d8df43b797fc842529f8499b4493c66bc /tests/auto
parentc46c06d363b7c90fecd84e7ef333ffa449f1d71c (diff)
parent6f8364ac0c128eb8afe897b5d8f3f4e26b9105f5 (diff)
downloadQt-0def696a8d569f0895010706fb989e78b25c13c1.zip
Qt-0def696a8d569f0895010706fb989e78b25c13c1.tar.gz
Qt-0def696a8d569f0895010706fb989e78b25c13c1.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix writing duplicate headers' properties in designer. Fix dealing with the default dynamic properties of string type. Use unifiedToolBarOnMac, by default don't show some tool action.
Diffstat (limited to 'tests/auto')
0 files changed, 0 insertions, 0 deletions