diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 16:32:13 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 16:32:13 +1000 |
| commit | a80130b07c5b8ee4b06eabbceb65eb23d4d4602e (patch) | |
| tree | 403a1f35f8b11fa60ce3c1959dcb41e6a55bde1e /src/gui/text/qtextodfwriter_p.h | |
| parent | 51684a152f380ed86bb45303871c0881f138d6d9 (diff) | |
| parent | 8fff413524c588f496a9ba5ac07c75e534bc036e (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix QtOpenGL def file for armv5.
Disable QtConcurrent for Symbian winscw builds.
Fix loss of focus and activation when hiding a child widget
Symbian build failure for Armv5
Fix softkeys in case a dialog with softkeys that have icons is closed.
Update softkeys after orientation switch.
Provide internal API to avoid automatic translation of input widget
Do not allow fullscreen/maximized windows to expand beyond client rect
Diffstat (limited to 'src/gui/text/qtextodfwriter_p.h')
0 files changed, 0 insertions, 0 deletions