summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'softkeys_without_stack'Markku Luukkainen2009-06-1018-45/+433
|\
| * Merge branch 'softkeys_without_stack' of git@scm.dev.nokia.troll.no:qt/qt-s60...Markku Luukkainen2009-06-102-4/+5
| |\
| | * Call DrawDeferred() after setting softkeysAlessandro Portale2009-06-101-0/+1
| | * Itemviews have go their focus frame back.Alessandro Portale2009-06-091-4/+4
| * | Moved softkeys example to a better placeMarkku Luukkainen2009-06-104-165/+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
| * Merge branch 'softkeys_without_stack' of git@scm.dev.nokia.troll.no:qt/qt-s60...Markku Luukkainen2009-06-081-0/+7
| |\
| | * 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 s...Markku Luukkainen2009-06-0832-86/+191
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into sof...Markku Luukkainen2009-06-0832-86/+191
| | |\
| * | | Changed combobox to use popup as a parent when setting softkeys.Markku Luukkainen2009-06-061-1/+1
| * | | 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
| * | | Fixes to make gui compile after clean configure. RemovalMarkku Luukkainen2009-06-066-14/+18
| * | | 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
| * | | Disabled context sensitive menu because it would cause compilationMarkku Luukkainen2009-06-061-2/+2
| * | | 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
| * | | 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
| |/ /
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into sof...Markku Luukkainen2009-06-054-28/+79
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into sof...Markku Luukkainen2009-06-052-3/+4
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into sof...Markku Luukkainen2009-06-0519-309/+922
| |\ \ \ \
| * \ \ \ \ Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into s...Markku Luukkainen2009-06-053-23/+22
| |\ \ \ \ \
| | * | | | | Adding and removing a 'Cancel' SoftKeyAlessandro Portale2009-06-031-2/+14
| | * | | | | Fix mergeAlessandro Portale2009-06-031-2/+1
| | * | | | | Resolving merge conflictsAlessandro Portale2009-06-03119-1018/+2881
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into sof...Markku Luukkainen2009-06-03119-998/+2873
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Added automatic creation for symbian os if softkeystack is enabled.Markku Luukkainen2009-06-031-0/+3
| * | | | | | | Using softkeys for the Cancel/Back buttons during keypad navigationAlessandro Portale2009-06-011-1/+8
| * | | | | | | warnings--Alessandro Portale2009-06-012-3/+2
| * | | | | | | Merge commit 'origin/master' into softkeysAlessandro Portale2009-06-014-6/+10
| |\ \ \ \ \ \ \
| * | | | | | | | Make sure that the QKeyEventSoftKey gets deleted when the actionAlessandro Portale2009-05-301-0/+1
| * | | | | | | | Delete the actions in the popped SoftKeySets.Alessandro Portale2009-05-301-9/+11
| * | | | | | | | Implemented QKeyEventSoftKey::removeSoftkey and using it inAlessandro Portale2009-05-293-3/+12
| * | | | | | | | Append and push the softKey instead of the empty listAlessandro Portale2009-05-291-1/+1
| * | | | | | | | Pulled helper menuActionList() out of QSoftKeyStack::handleFocusChanged.Alessandro Portale2009-05-291-11/+17
| * | | | | | | | Making hasSoftKeyStack() const. +coding conventions.Alessandro Portale2009-05-292-11/+8
| * | | | | | | | Merge commit 'origin/master' into softkeysAlessandro Portale2009-05-2910-99/+163
| |\ \ \ \ \ \ \ \