summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-06-1728-37/+4797
|\
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-171-4/+7
| |\
| | * Fixed indentation.axis2009-06-171-4/+4
| | |
| | * Readded code that was lost during exception integration.axis2009-06-171-0/+3
| | | | | | | | | | | | | | | AutoTest: Passed RevBy: Trust me
| * | Removed incorrect Carbide version from compiler patching instructions.Miikka Heikkinen2009-06-171-2/+3
| |/
| * Added proper UID for webkit examples and browser demoMiikka Heikkinen2009-06-175-0/+10
| |
| * Making the writing in the status label in sync with the current state.Aleksandar Sasha Babic2009-06-171-0/+1
| | | | | | | | The writings were wrong after i.e. ftp -> connect -> disconnect.
| * major rewrite - make it valgrind friendlyHarald Fernengel2009-06-165-74/+4379
| |
| * Fix crash in case of out of memoryHarald Fernengel2009-06-161-2/+12
| | | | | | | | RevBy: Robert Griebl
| * add object exception test as wellHarald Fernengel2009-06-161-9/+53
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-06-161-2/+1
| |\
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicHarald Fernengel2009-06-161-0/+4
| | |\
| | * | compile without exception supportHarald Fernengel2009-06-161-2/+1
| | | |
| * | | Remove extra bracket on stlportv5 detection.Jason Barron2009-06-161-1/+1
| | |/ | |/|
| * | Doc: Merged my changes to the topic page to those already in the branch.David Boddie2009-06-161-0/+4
| |/ | | | | | | Reviewed-by: Trust Me
| * Fix detection of stlportv5.Jason Barron2009-06-161-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-publicHarald Fernengel2009-06-165-13/+35
| |\
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-06-166-10/+48
| | |\
| | | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-165-6/+40
| | | |\
| | | | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-06-1624-19/+57
| | | | |\
| | | | * | Fix Qt network autotest compilation for ARMV5.Janne Anttila2009-06-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build was broken by commit: 7604f8087f88171ef933d8ae08f501467e647338
| | | * | | Installation instructions updateMiikka Heikkinen2009-06-161-4/+8
| | | | | |
| | * | | | Update softkeys correctly when no focus widget is present.Jason Barron2009-06-163-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 checkerHarald Fernengel2009-06-163-0/+327
| | |_|/ | |/| |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-06-161-2/+0
| |\ \ \
| | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicLiang Qi2009-06-162-2/+35
| | |\ \ \
| | * | | | Fix for Task #256159Liang Qi2009-06-161-2/+0
| | | |/ / | | |/| |
| * | | | getting ftp to build in RnD environmentsmread2009-06-161-0/+1
| | |/ / | |/| |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicHarald Fernengel2009-06-1622-23/+38
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-162-5/+11
| | |\ \
| | * | | Fixed fluidlauncher config for S60 and updated softkeys screenshot.Miikka Heikkinen2009-06-163-10/+10
| | | | |
| * | | | doc: document QScopedPointer with forward declared classesHarald Fernengel2009-06-162-2/+35
| | | | | | | | | | | | | | | | | | | | Also some small doc cleanups
* | | | | longtap event gets properly cancelled when entering popupJanne Koskinen2009-06-171-6/+9
| | | | |
* | | | | Revert "Removed accidental allocation in QRingBuffer::clear()"Janne Koskinen2009-06-171-9/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 85e940d2fa5e8d2caf0d157f214bb826fc392e7b.
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-06-1620-22/+37
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-06-1618-19/+22
| |\ \ \ \
| | * | | | Bugfix. Softkeys were set to wrong widget when combobox wasMarkku Luukkainen2009-06-161-3/+9
| | | |/ / | | |/| | | | | | | | | | | | focused.
| | * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-1633-218/+790
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: demos/embedded/fluidlauncher/config_s60/config.xml
| | | * | Fix commit 82e19a10f13005a327b134999315ecf39d5d70e3Alessandro Portale2009-06-151-4/+4
| | | | |
| | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAlessandro Portale2009-06-152-4/+4
| | | |\ \
| | | * | | Fix for Task #256174Alessandro Portale2009-06-151-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back the keyPad Navigation focus visualization. It disappeared with commit e0690577327097ec3d9be99205bfcf01f8404d23
| | * | | | New screenshots for S60 fluidlauncher.Miikka Heikkinen2009-06-1616-9/+9
| | | | | |
| * | | | | Revert "added sendui.lib to qtgui"Janne Koskinen2009-06-161-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | library was removed on purpose, linking issues shouldn't happen. This reverts commit 12b4262f1f6e5d7560c0495096e86668cdf69cad.
| * | | | added sendui.lib to qtguiJanne Koskinen2009-06-151-2/+2
| | | | |
| * | | | Remove warningsAlessandro Portale2009-06-151-2/+2
| | |/ / | |/| |
| * | | Remove compiler warning on Qt/WindowsAlessandro Portale2009-06-152-1/+13
| | |/ | |/| | | | | | | | | | | | | The QFileDialogPrivate constructor must be non-inline. RevBy: Harald Fernengel
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-06-158-39/+99
|\ \ \ | |/ /
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicHarald Fernengel2009-06-156-39/+94
| |\ \
| | * | Improving the code for setting the default IAP.Aleksandar Sasha Babic2009-06-152-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-publicmread2009-06-158-40/+55
| | |\ \
generated by cgit v0.12 at 2025-01-04 07:26:37 (GMT)