diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 23:00:27 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 23:00:27 (GMT) |
commit | 6a786ab4bb4a5e1d80ce511461f2018237f1614a (patch) | |
tree | 708ec88d4b3d44c56da5e3a6a5c4587fa0d7aae8 /src/multimedia | |
parent | 4b14e87b72e7cd52841c5fc3183accf35c0395d1 (diff) | |
parent | 0fcee2f495eb2e1c4b76aa8c3e5462595aed0ab3 (diff) | |
download | Qt-6a786ab4bb4a5e1d80ce511461f2018237f1614a.zip Qt-6a786ab4bb4a5e1d80ce511461f2018237f1614a.tar.gz Qt-6a786ab4bb4a5e1d80ce511461f2018237f1614a.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Account for native child widgets when handling focus events
Added support for using inputMethodHints in QInputDialog edit widget.
Fixed some preprocessor parameters for Mac support.
Fixed missing QMAKE_MOC definition in certain mkspecs.
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions