summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-15 15:35:00 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-15 15:35:00 (GMT)
commitde1c505ddb5acedf96168df00172b9e3a694a32d (patch)
treeab8c69b1a1dec5a65986afe86853904f5aea49e7 /src/script
parent9ecd481a859977660b68a57d3b2203f75377ccc4 (diff)
parent0caad7dc081812fcc056d917288757b2e475ea05 (diff)
downloadQt-de1c505ddb5acedf96168df00172b9e3a694a32d.zip
Qt-de1c505ddb5acedf96168df00172b9e3a694a32d.tar.gz
Qt-de1c505ddb5acedf96168df00172b9e3a694a32d.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes auto-test failure for 9da13ea53aec6d841ba7f416531d6c52d4368df4. Fixes tooltips for QGraphicsProxyWidget.
Diffstat (limited to 'src/script')
0 files changed, 0 insertions, 0 deletions