summaryrefslogtreecommitdiffstats
path: root/tests/auto/qatomicpointer
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-30 08:18:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-30 08:18:02 (GMT)
commit50781a66bd11c3201c7f9c520490dc352e239dac (patch)
tree75d77ca3aca8fe671c54e74ed191d1938f6db765 /tests/auto/qatomicpointer
parent78c5825cfb7702350636b7624bf79311dbd0dbd5 (diff)
parenta1b2be3c8a64aee832c648c6dcdff003f22318a3 (diff)
downloadQt-50781a66bd11c3201c7f9c520490dc352e239dac.zip
Qt-50781a66bd11c3201c7f9c520490dc352e239dac.tar.gz
Qt-50781a66bd11c3201c7f9c520490dc352e239dac.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QDeclarative::hasActiveFocus should return false for hidden items FocusScope's focusItem must always be a descendent
Diffstat (limited to 'tests/auto/qatomicpointer')
0 files changed, 0 insertions, 0 deletions