summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-05 16:52:36 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-05 16:52:36 (GMT)
commitfe239b32550e83e8a42617457adca8d7922ff92f (patch)
tree169cbe3b37b547f9f175f3d29c89b4c3a1e7dad0 /tools/assistant
parent4e40db0481bef688e43d4b28b6dedefa06e277c0 (diff)
parentf75d55f1a71cae9864ca4bf12c92fcd9e34ed651 (diff)
downloadQt-fe239b32550e83e8a42617457adca8d7922ff92f.zip
Qt-fe239b32550e83e8a42617457adca8d7922ff92f.tar.gz
Qt-fe239b32550e83e8a42617457adca8d7922ff92f.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running" Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842) Get rid of setFirstActionActive on mouse release in QMenu
Diffstat (limited to 'tools/assistant')
0 files changed, 0 insertions, 0 deletions