Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-06-10 | 381 | -2318/+4804 |
|\ | |||||
| * | Fix "post linker error" with GCCE. | Frans Englich | 2009-06-10 | 1 | -0/+11 |
| | | | | | | | | Reviewed-by: Miikka Heikkinen | ||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Markku Luukkainen | 2009-06-10 | 363 | -2273/+4184 |
| |\ | |||||
| | * | Make Qt exception safer. | Robert Griebl | 2009-06-10 | 360 | -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. | axis | 2009-06-10 | 2 | -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 UID | Markku Luukkainen | 2009-06-10 | 1 | -1/+11 |
| | | | |||||
| * | | Added softkeys example | Markku Luukkainen | 2009-06-10 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'softkeys_without_stack' | Markku Luukkainen | 2009-06-10 | 22 | -45/+598 |
| |\ \ | |||||
| | * \ | Merge branch 'softkeys_without_stack' of ↵ | Markku Luukkainen | 2009-06-10 | 2 | -4/+5 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys_without_stack | ||||
| | | * | | Call DrawDeferred() after setting softkeys | Alessandro Portale | 2009-06-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK 3.1 and maybe also 3.2 need an extra invitation. RevvBy: maluukka | ||||
| | | * | | Itemviews have go their focus frame back. | Alessandro Portale | 2009-06-09 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Got lost with dc177883bf98a68e61c9a9cda7e1ba9464079275 | ||||
| | * | | | Moved softkeys example to a better place | Markku Luukkainen | 2009-06-10 | 4 | -0/+0 |
| | | | | | |||||
| | * | | | Skeleton implementation for softkeys example | Markku Luukkainen | 2009-06-10 | 4 | -107/+145 |
| | | | | | |||||
| | * | | | Better handling for setting softkeys | Markku Luukkainen | 2009-06-10 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Fixes from code review | Markku Luukkainen | 2009-06-09 | 7 | -72/+25 |
| | | | | |||||
| | * | | Fixes from code review | Markku Luukkainen | 2009-06-08 | 12 | -57/+70 |
| | | | | |||||
| | * | | Removed QSoftkeySet as it wasn't used anymore | Markku Luukkainen | 2009-06-08 | 1 | -3/+1 |
| | | | | |||||
| | * | | Set empty buttons by default | Markku Luukkainen | 2009-06-08 | 1 | -0/+3 |
| | | | | |||||
| | * | | Implemented context sensitive menu item | Markku Luukkainen | 2009-06-08 | 1 | -17/+15 |
| | | | | |||||
| | * | | Fixed parsing error when doing configure+compile in clean | Markku Luukkainen | 2009-06-08 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | environment | ||||
| | * | | Merge branch 'softkeys_without_stack' of ↵ | Markku Luukkainen | 2009-06-08 | 1 | -0/+7 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys_without_stack | ||||
| | | * | | Make the linker happy on non-Q_WS_S60 | Alessandro Portale | 2009-06-07 | 1 | -0/+7 |
| | | | | | |||||
| | * | | | Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Markku Luukkainen | 2009-06-08 | 61 | -177/+1110 |
| | |\ \ \ | | | |/ / | | |/| | | | | | | | softkeys_without_stack | ||||
| | | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Markku Luukkainen | 2009-06-08 | 61 | -177/+1110 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | softkeys | ||||
| | * | | | | Changed combobox to use popup as a parent when setting softkeys. | Markku Luukkainen | 2009-06-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This enables the softkeys to actually be visible on the screen | ||||
| | * | | | | Added implementation to get default role names | Markku Luukkainen | 2009-06-06 | 2 | -0/+27 |
| | | | | | | |||||
| | * | | | | Added support for setting softkeys dynamically | Markku Luukkainen | 2009-06-06 | 2 | -3/+6 |
| | | | | | | |||||
| | * | | | | Fixed bug that caused the softkeys list not to be cleared after | Markku Luukkainen | 2009-06-06 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | the softkeys in the list were deleted | ||||
| | * | | | | Fixes to make gui compile after clean configure. Removal | Markku Luukkainen | 2009-06-06 | 7 | -17/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | of QSoftKeyStack broke compilation on clean environment... | ||||
| | * | | | | Added helper class to make adding/removing softkeys easier | Markku Luukkainen | 2009-06-06 | 2 | -0/+149 |
| | | | | | | |||||
| | * | | | | Removed QSoftKeyStack and replaced places using it with the | Markku Luukkainen | 2009-06-06 | 14 | -991/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | new improved softkey interface in QWidget | ||||
| | * | | | | Disabled context sensitive menu because it would cause compilation | Markku Luukkainen | 2009-06-06 | 1 | -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 SoftKeyRole | Markku Luukkainen | 2009-06-06 | 2 | -70/+1 |
| | | | | | | |||||
| | * | | | | Added mapping from native hardware keys to softkeys. This enables | Markku Luukkainen | 2009-06-06 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | the QActions with softKeyRole to be triggered | ||||
| | * | | | | Replaced usage of QSoftKeyActions with QActions+SoftKeyRoles | Markku Luukkainen | 2009-06-06 | 5 | -25/+29 |
| | | | | | | |||||
| | * | | | | Renamed SoftKeyRoles to be more descriptive | Markku Luukkainen | 2009-06-06 | 1 | -3/+5 |
| | | | | | | |||||
| | * | | | | Added SoftKeyRole | Markku Luukkainen | 2009-06-06 | 3 | -0/+35 |
| | | | | | | |||||
| | * | | | | Initial version of softkey implementation that doesn't use | Markku Luukkainen | 2009-06-05 | 7 | -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 Luukkainen | 2009-06-05 | 6 | -59/+93 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | softkeys | ||||
| | * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Markku Luukkainen | 2009-06-05 | 4 | -23/+19 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | softkeys | ||||
| | * \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Markku Luukkainen | 2009-06-05 | 22 | -321/+1030 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | softkeys | ||||
| | * \ \ \ \ \ | Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Markku Luukkainen | 2009-06-05 | 8 | -351/+33 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | softkeys Conflicts: src/gui/kernel/qapplication_s60.cpp | ||||
| | | * | | | | | | Adding and removing a 'Cancel' SoftKey | Alessandro Portale | 2009-06-03 | 1 | -2/+14 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge commit 'origin/master' into softkeys | Alessandro Portale | 2009-06-03 | 1 | -1/+6 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Fix merge | Alessandro Portale | 2009-06-03 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Resolving merge conflicts | Alessandro Portale | 2009-06-03 | 223 | -1992/+13864 |
| | | |\ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Markku Luukkainen | 2009-06-03 | 220 | -1645/+13851 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | softkeys Conflicts: src/gui/kernel/qapplication_s60.cpp | ||||
| | * | | | | | | | | | Added automatic creation for symbian os if softkeystack is enabled. | Markku Luukkainen | 2009-06-03 | 1 | -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 navigation | Alessandro Portale | 2009-06-01 | 1 | -1/+8 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | warnings-- | Alessandro Portale | 2009-06-01 | 2 | -3/+2 |
| | | | | | | | | | | |