Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add object exception test as well | Harald Fernengel | 2009-06-16 | 1 | -9/+53 |
| | |||||
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Jason Barron | 2009-06-16 | 1 | -2/+1 |
|\ | |||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Harald Fernengel | 2009-06-16 | 1 | -0/+4 |
| |\ | |||||
| * | | compile without exception support | Harald Fernengel | 2009-06-16 | 1 | -2/+1 |
| | | | |||||
* | | | Remove extra bracket on stlportv5 detection. | Jason Barron | 2009-06-16 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Doc: Merged my changes to the topic page to those already in the branch. | David Boddie | 2009-06-16 | 1 | -0/+4 |
|/ | | | | Reviewed-by: Trust Me | ||||
* | Fix detection of stlportv5. | Jason Barron | 2009-06-16 | 1 | -2/+4 |
| | | | | | | | | | | | Using two concatenated variables as an argument to exists() causes problems because this can expand to '//' which qmake thinks is a valid path (if at the beginning), but this is not what we want here. So add a work around to manually expand the path without the additional '/' character and then add a comment saying that changing one should change the other. Reviewed-by: Miikka Heikkinen | ||||
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Harald Fernengel | 2009-06-16 | 5 | -13/+35 |
|\ | |||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Jason Barron | 2009-06-16 | 6 | -10/+48 |
| |\ | |||||
| | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-06-16 | 5 | -6/+40 |
| | |\ | |||||
| | | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Janne Anttila | 2009-06-16 | 24 | -19/+57 |
| | | |\ | |||||
| | | * | | Fix Qt network autotest compilation for ARMV5. | Janne Anttila | 2009-06-16 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build was broken by commit: 7604f8087f88171ef933d8ae08f501467e647338 | ||||
| | * | | | Installation instructions update | Miikka Heikkinen | 2009-06-16 | 1 | -4/+8 |
| | | | | | |||||
| * | | | | Update softkeys correctly when no focus widget is present. | Jason Barron | 2009-06-16 | 3 | -7/+23 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case where there is no focus widget present, the button group container should be updated with the softkeys from the currently active window if it has softkeys. This patch enables this behavior. Also modify QMainWindow such that the soft keys are updated when the main window becomes the active window and not only when the menu bar is set. At the moment, this creates a new QAction and this should be changed since it will continuously grow the memory. As a final fix, move the soft key setting out of setFocus() because it is much to early. At the point, the widget does not know for certain that it actually will get focus since it could be disabled or have a focus proxy. | ||||
* | | | | add an out of memory checker | Harald Fernengel | 2009-06-16 | 3 | -0/+327 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | mread | 2009-06-16 | 1 | -2/+0 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Liang Qi | 2009-06-16 | 2 | -2/+35 |
| |\ \ \ | |||||
| * | | | | Fix for Task #256159 | Liang Qi | 2009-06-16 | 1 | -2/+0 |
| | |/ / | |/| | | |||||
* | | | | getting ftp to build in RnD environments | mread | 2009-06-16 | 1 | -0/+1 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Harald Fernengel | 2009-06-16 | 22 | -23/+38 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-06-16 | 2 | -5/+11 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Janne Koskinen | 2009-06-16 | 18 | -19/+22 |
| | |\ \ | |||||
| | | * | | Bugfix. Softkeys were set to wrong widget when combobox was | Markku Luukkainen | 2009-06-16 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | focused. | ||||
| | * | | | Revert "added sendui.lib to qtgui" | Janne Koskinen | 2009-06-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | library was removed on purpose, linking issues shouldn't happen. This reverts commit 12b4262f1f6e5d7560c0495096e86668cdf69cad. | ||||
| * | | | | Fixed fluidlauncher config for S60 and updated softkeys screenshot. | Miikka Heikkinen | 2009-06-16 | 3 | -10/+10 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-06-16 | 33 | -218/+790 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: demos/embedded/fluidlauncher/config_s60/config.xml | ||||
| | * | | Fix commit 82e19a10f13005a327b134999315ecf39d5d70e3 | Alessandro Portale | 2009-06-15 | 1 | -4/+4 |
| | | | | |||||
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Alessandro Portale | 2009-06-15 | 2 | -4/+4 |
| | |\ \ | | | |/ | |||||
| | | * | added sendui.lib to qtgui | Janne Koskinen | 2009-06-15 | 1 | -2/+2 |
| | | | | |||||
| | | * | Remove warnings | Alessandro Portale | 2009-06-15 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix for Task #256174 | Alessandro Portale | 2009-06-15 | 1 | -6/+3 |
| | |/ | | | | | | | | | | | | | Bring back the keyPad Navigation focus visualization. It disappeared with commit e0690577327097ec3d9be99205bfcf01f8404d23 | ||||
| | * | Remove compiler warning on Qt/Windows | Alessandro Portale | 2009-06-15 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | The QFileDialogPrivate constructor must be non-inline. RevBy: Harald Fernengel | ||||
| * | | New screenshots for S60 fluidlauncher. | Miikka Heikkinen | 2009-06-16 | 16 | -9/+9 |
| | | | |||||
* | | | doc: document QScopedPointer with forward declared classes | Harald Fernengel | 2009-06-16 | 2 | -2/+35 |
| |/ |/| | | | | | Also some small doc cleanups | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Harald Fernengel | 2009-06-15 | 6 | -39/+94 |
|\ \ | |||||
| * | | Improving the code for setting the default IAP. | Aleksandar Sasha Babic | 2009-06-15 | 2 | -26/+75 |
| | | | | | | | | | | | | | | | | | | | | | First we ask if there is already active IAP. If yes, we will use that one, if not IAP dialog will pop-up. This strategy should save us from some dialogs when accessing the network. | ||||
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | mread | 2009-06-15 | 8 | -40/+55 |
| |\ \ | |||||
| | * | | Added Softkeys example to fluidlauncher | Markku Luukkainen | 2009-06-15 | 3 | -10/+14 |
| | | | | |||||
| * | | | undeclared variable when exceptions disabled | mread | 2009-06-15 | 1 | -3/+5 |
| | | | | |||||
* | | | | export qBadAlloc only if exceptions are on | Harald Fernengel | 2009-06-15 | 2 | -0/+5 |
| |/ / |/| | | |||||
* | | | remove compiler warning on MSVC | Harald Fernengel | 2009-06-15 | 1 | -1/+1 |
| | | | |||||
* | | | Remove compiler warning on Qt/Windows | Harald Fernengel | 2009-06-15 | 2 | -25/+29 |
| | | | | | | | | | | | | | | | | | | The QFileDialogPrivate constructor must be non-inline. RevBy: aportale | ||||
* | | | Include Phonon changes. | Frans Englich | 2009-06-15 | 1 | -2/+5 |
| | | | |||||
* | | | updated changes-4.5.2-tower. | Janne Koskinen | 2009-06-15 | 1 | -1/+5 |
| | | | |||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Markku Luukkainen | 2009-06-15 | 1 | -39/+44 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | mread | 2009-06-15 | 2 | -26/+70 |
| |\ \ | |||||
| * | | | fixed code formatting to Qt style | mread | 2009-06-15 | 1 | -39/+44 |
| | | | | |||||
* | | | | Added ExitSoftKey role | Markku Luukkainen | 2009-06-15 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Markku Luukkainen | 2009-06-15 | 9 | -68/+271 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | mread | 2009-06-15 | 5 | -19/+197 |
| |\ \ |