summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-10381-2318/+4804
|\
| * Fix "post linker error" with GCCE.Frans Englich2009-06-101-0/+11
| | | | | | | | Reviewed-by: Miikka Heikkinen
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicMarkku Luukkainen2009-06-10363-2273/+4184
| |\
| | * Make Qt exception safer.Robert Griebl2009-06-10360-2217/+4165
| | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
| | * Fixed the mouse handler of FEP when in inline edit mode.axis2009-06-102-55/+18
| | | | | | | | | | | | | | | | | | We now commit the text if the mouse handler is invoked. This prevents the case where the VK cannot be brought up because the widget is the only focusable widget and is stuck in inline edit mode.
| * | Added proper UIDMarkku Luukkainen2009-06-101-1/+11
| | |
| * | Added softkeys exampleMarkku Luukkainen2009-06-101-1/+2
| | |
| * | Merge branch 'softkeys_without_stack'Markku Luukkainen2009-06-1022-45/+598
| |\ \
| | * \ Merge branch 'softkeys_without_stack' of ↵Markku Luukkainen2009-06-102-4/+5
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys_without_stack
| | | * | Call DrawDeferred() after setting softkeysAlessandro Portale2009-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK 3.1 and maybe also 3.2 need an extra invitation. RevvBy: maluukka
| | | * | Itemviews have go their focus frame back.Alessandro Portale2009-06-091-4/+4
| | | | | | | | | | | | | | | | | | | | Got lost with dc177883bf98a68e61c9a9cda7e1ba9464079275
| | * | | Moved softkeys example to a better placeMarkku Luukkainen2009-06-104-0/+0
| | | | |
| | * | | Skeleton implementation for softkeys exampleMarkku Luukkainen2009-06-104-107/+145
| | | | |
| | * | | Better handling for setting softkeysMarkku Luukkainen2009-06-101-1/+1
| | |/ /
| | * | Fixes from code reviewMarkku Luukkainen2009-06-097-72/+25
| | | |
| | * | Fixes from code reviewMarkku Luukkainen2009-06-0812-57/+70
| | | |
| | * | Removed QSoftkeySet as it wasn't used anymoreMarkku Luukkainen2009-06-081-3/+1
| | | |
| | * | Set empty buttons by defaultMarkku Luukkainen2009-06-081-0/+3
| | | |
| | * | Implemented context sensitive menu itemMarkku Luukkainen2009-06-081-17/+15
| | | |
| | * | Fixed parsing error when doing configure+compile in cleanMarkku Luukkainen2009-06-081-5/+4
| | | | | | | | | | | | | | | | environment
| | * | Merge branch 'softkeys_without_stack' of ↵Markku Luukkainen2009-06-081-0/+7
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys_without_stack
| | | * | Make the linker happy on non-Q_WS_S60Alessandro Portale2009-06-071-0/+7
| | | | |
| | * | | Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-0861-177/+1110
| | |\ \ \ | | | |/ / | | |/| | | | | | | softkeys_without_stack
| | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-0861-177/+1110
| | | |\ \ | | | | | | | | | | | | | | | | | | softkeys
| | * | | | Changed combobox to use popup as a parent when setting softkeys.Markku Luukkainen2009-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This enables the softkeys to actually be visible on the screen
| | * | | | Added implementation to get default role namesMarkku Luukkainen2009-06-062-0/+27
| | | | | |
| | * | | | Added support for setting softkeys dynamicallyMarkku Luukkainen2009-06-062-3/+6
| | | | | |
| | * | | | Fixed bug that caused the softkeys list not to be cleared afterMarkku Luukkainen2009-06-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | the softkeys in the list were deleted
| | * | | | Fixes to make gui compile after clean configure. RemovalMarkku Luukkainen2009-06-067-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | of QSoftKeyStack broke compilation on clean environment...
| | * | | | Added helper class to make adding/removing softkeys easierMarkku Luukkainen2009-06-062-0/+149
| | | | | |
| | * | | | Removed QSoftKeyStack and replaced places using it with theMarkku Luukkainen2009-06-0614-991/+10
| | | | | | | | | | | | | | | | | | | | | | | | new improved softkey interface in QWidget
| | * | | | Disabled context sensitive menu because it would cause compilationMarkku Luukkainen2009-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failure. Context menu will be enabled again once the QAction SoftKeyRole implementation is in state where context menu can be properly supported
| | * | | | Replaced usage of QSoftKeyStack with QActions having SoftKeyRoleMarkku Luukkainen2009-06-062-70/+1
| | | | | |
| | * | | | Added mapping from native hardware keys to softkeys. This enablesMarkku Luukkainen2009-06-061-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | the QActions with softKeyRole to be triggered
| | * | | | Replaced usage of QSoftKeyActions with QActions+SoftKeyRolesMarkku Luukkainen2009-06-065-25/+29
| | | | | |
| | * | | | Renamed SoftKeyRoles to be more descriptiveMarkku Luukkainen2009-06-061-3/+5
| | | | | |
| | * | | | Added SoftKeyRoleMarkku Luukkainen2009-06-063-0/+35
| | | | | |
| | * | | | Initial version of softkey implementation that doesn't useMarkku Luukkainen2009-06-057-4/+144
| | |/ / / | | | | | | | | | | | | | | | softkeystack but instead softkeys are stored in QWidgets.
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-056-59/+93
| | |\ \ \ | | | | | | | | | | | | | | | | | | softkeys
| | * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-054-23/+19
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | softkeys
| | * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-0522-321/+1030
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | softkeys
| | * \ \ \ \ \ Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-058-351/+33
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | softkeys Conflicts: src/gui/kernel/qapplication_s60.cpp
| | | * | | | | | Adding and removing a 'Cancel' SoftKeyAlessandro Portale2009-06-031-2/+14
| | | | | | | | |
| | | * | | | | | Merge commit 'origin/master' into softkeysAlessandro Portale2009-06-031-1/+6
| | | |\ \ \ \ \ \
| | | * | | | | | | Fix mergeAlessandro Portale2009-06-031-2/+1
| | | | | | | | | |
| | | * | | | | | | Resolving merge conflictsAlessandro Portale2009-06-03223-1992/+13864
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-06-03220-1645/+13851
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | softkeys Conflicts: src/gui/kernel/qapplication_s60.cpp
| | * | | | | | | | | Added automatic creation for symbian os if softkeystack is enabled.Markku Luukkainen2009-06-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This circumvents the need to go and change every example to explicitly start using softkeystack
| | * | | | | | | | | Using softkeys for the Cancel/Back buttons during keypad navigationAlessandro Portale2009-06-011-1/+8
| | | | | | | | | | |
| | * | | | | | | | | warnings--Alessandro Portale2009-06-012-3/+2
| | | | | | | | | | |