summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-05 02:00:15 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-05 02:00:15 (GMT)
commitcaaf44f7a4f22189248d43a3074b4fba90df36a6 (patch)
tree31bb4e516804d6e6b3935ef3b80612c906acf30c /src/plugins
parente3ee3780777b07e6283a8b33cd4f7e1d56241d1c (diff)
parent51fa7df978d71a366c95c732d6a8c2576690d63a (diff)
downloadQt-caaf44f7a4f22189248d43a3074b4fba90df36a6.zip
Qt-caaf44f7a4f22189248d43a3074b4fba90df36a6.tar.gz
Qt-caaf44f7a4f22189248d43a3074b4fba90df36a6.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add convenience constructor to QTextOption::Tab Make qbswap() use glibc's fast bswap_*() functions if available. Fix in Addressbook tutorial Avoid timer starvation during high posted event activity fix for using .lnk files when running app from UNC
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions