summaryrefslogtreecommitdiffstats
path: root/dist/changes-0.98
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-13 15:57:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-13 15:57:46 (GMT)
commitff60c64c30a2e889b7a894b7b4b38484b7dfe31a (patch)
tree76b12b44b57e91bc6a31757e1729c140c4f79ab3 /dist/changes-0.98
parent896cd4bd08181ad16ad9cee6d2aaa1844a4f06d3 (diff)
parentbd9d5c80235ce6d1b005df96c3058b75e82bd6f0 (diff)
downloadQt-ff60c64c30a2e889b7a894b7b4b38484b7dfe31a.zip
Qt-ff60c64c30a2e889b7a894b7b4b38484b7dfe31a.tar.gz
Qt-ff60c64c30a2e889b7a894b7b4b38484b7dfe31a.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 a small protection against releasing a timer twice. Use constants the timer ID masks instead of values everywhere Fix ABA problem with: the serial must be updated on all accesses Comment a bit more the timer ID allocation code.
Diffstat (limited to 'dist/changes-0.98')
0 files changed, 0 insertions, 0 deletions