diff options
author | axis <qt-info@nokia.com> | 2009-05-06 13:19:50 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-05-06 13:19:50 (GMT) |
commit | ca8c15a61a311adc676df099e5ebb882948ea609 (patch) | |
tree | 7ea397312498334e06bba2f5f0d4c43aee655fff /src/gui/kernel/qwidget.cpp | |
parent | 02795aeda1f064443bfc44db1539983b582220e6 (diff) | |
parent | ae3a933997580381c052fdba74e38df37cf78722 (diff) | |
parent | c4ee1ec3f05e14d17708d6e1102ba7dd994d422a (diff) | |
download | Qt-ca8c15a61a311adc676df099e5ebb882948ea609.zip Qt-ca8c15a61a311adc676df099e5ebb882948ea609.tar.gz Qt-ca8c15a61a311adc676df099e5ebb882948ea609.tar.bz2 |
Merge branches 'virtualKeyboardAPI' and 'imHintsForS60'