| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Janne Anttila | 2009-06-18 | 17 | -50/+130 |
| |\ | |||||
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Janne Koskinen | 2009-06-17 | 4 | -25/+82 |
| | |\ | |||||
| | | * | aportales changes for Qt for S60 "Tower" | Alessandro Portale | 2009-06-17 | 1 | -0/+15 |
| | | | | |||||
| | | * | Renamed "menu" to "options" for S60. This follows the native style | Markku Luukkainen | 2009-06-17 | 1 | -2/+2 |
| | | | | |||||
| | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Jason Barron | 2009-06-17 | 1 | -2/+12 |
| | | |\ | |||||
| | | | * | added changes done to tower | Markku Luukkainen | 2009-06-17 | 1 | -2/+12 |
| | | | | | |||||
| | | * | | Improve softkey implementation and add a default 'Exit' button to RSK. | Jason Barron | 2009-06-17 | 2 | -21/+53 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation had some problems where the actual position of the softkey was determined by it's position in the list. This is suboptimal since the position should be tied to the role. Actions that have "negative" conotation should be located on the right soft key (RSK) while "positive" actions go on the left soft key (LSK). This is according to the S60 User Interface Guide. It is also standard practice in S60 to have an 'Exit' button on the RSK so we add one of those if there is not already a key present there. Task-number: 256365 Reviewed-by: Markku Luukkainen | ||||
| | * | | added namespace guards | Janne Koskinen | 2009-06-17 | 1 | -2/+3 |
| | | | | |||||
| | * | | make qglobal.h compile when inlcuded from c-files | Janne Koskinen | 2009-06-17 | 1 | -5/+6 |
| | |/ | |||||
| | * | removed commented code | Janne Koskinen | 2009-06-17 | 1 | -1/+0 |
| | | | |||||
| | * | namespace fixes. s60main and corelib now compiles under a namespace | Janne Koskinen | 2009-06-17 | 3 | -9/+10 |
| | | | |||||
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Janne Koskinen | 2009-06-17 | 28 | -37/+4797 |
| | |\ | |||||
| | | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-06-17 | 1 | -4/+7 |
| | | |\ | |||||
| | | | * | Fixed indentation. | axis | 2009-06-17 | 1 | -4/+4 |
| | | | | | |||||
| | | | * | Readded code that was lost during exception integration. | axis | 2009-06-17 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | AutoTest: Passed RevBy: Trust me | ||||
| | | * | | Removed incorrect Carbide version from compiler patching instructions. | Miikka Heikkinen | 2009-06-17 | 1 | -2/+3 |
| | | |/ | |||||
| | | * | Added proper UID for webkit examples and browser demo | Miikka Heikkinen | 2009-06-17 | 5 | -0/+10 |
| | | | | |||||
| | * | | longtap event gets properly cancelled when entering popup | Janne Koskinen | 2009-06-17 | 1 | -6/+9 |
| | | | | |||||
| | * | | Revert "Removed accidental allocation in QRingBuffer::clear()" | Janne Koskinen | 2009-06-17 | 1 | -9/+3 |
| | | | | | | | | | | | | | This reverts commit 85e940d2fa5e8d2caf0d157f214bb826fc392e7b. | ||||
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Janne Koskinen | 2009-06-16 | 20 | -22/+37 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Janne Koskinen | 2009-06-15 | 8 | -39/+99 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Janne Koskinen | 2009-06-15 | 844 | -7646/+27257 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qringbuffer_p.h | ||||
| | * \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Janne Koskinen | 2009-05-20 | 11 | -90/+258 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Removed accidental allocation in QRingBuffer::clear() | Janne Koskinen | 2009-05-20 | 1 | -3/+9 |
| | | | | | | | | |||||
| * | | | | | | | Fixed FTP default IAP setting. Accidentaly reverted by ce409be66. | Janne Anttila | 2009-06-18 | 1 | -5/+4 |
| | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is important to close the RConnection before calling setdefaultif. This because setdefaultif triesd to open the connection, and if it is already open it may fail. | ||||
| * | | | | | | Making the writing in the status label in sync with the current state. | Aleksandar Sasha Babic | 2009-06-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The writings were wrong after i.e. ftp -> connect -> disconnect. | ||||
| * | | | | | | major rewrite - make it valgrind friendly | Harald Fernengel | 2009-06-16 | 5 | -74/+4379 |
| | | | | | | | |||||
| * | | | | | | Fix crash in case of out of memory | Harald Fernengel | 2009-06-16 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Robert Griebl | ||||
| * | | | | | | 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 |
| | | |\ \ \ \ \ \ | |||||
 |
index : Qt.git | |
| Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed. |
| summaryrefslogtreecommitdiffstats |