summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-2128-44/+63
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicEspen Riskedal2009-08-211-1/+1
| |\
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas...Harald Fernengel2009-08-217-58/+42
| | |\
| | * | compile.Harald Fernengel2009-08-211-1/+1
| * | | Rename demobase.pri to symbianpkgrules.priEspen Riskedal2009-08-2127-43/+62
| | |/ | |/|
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-21623-39516/+27394
|\ \ \ | |/ /
| * | Remove changes from bad merge.Jason Barron2009-08-211-3/+4
| * | Remove commented-out code from examples.axis2009-08-211-4/+0
| * | Removed an example that was listed twice.axis2009-08-211-1/+0
| * | Fixes: Missing deployment of backends for phonon examplesaxis2009-08-212-2/+6
| * | Revisiting test cases.Aleksandar Sasha Babic2009-08-211-48/+32
| * | Rebuild configure.exe.Jason Barron2009-08-211-0/+0
| |/
| * Merge branch 'reviewPatches'axis2009-08-215-50/+15
| |\
| | * Revert "Fixed KERN-EXEC 3 panic on ARMV5 builds caused by combining trinary o...axis2009-08-211-27/+0
| | * Switched to logical comparison instead of bitwise.axis2009-08-212-11/+6
| | * Fixed documentation.axis2009-08-211-3/+2
| | * Fixed some comments and code style issues after review.axis2009-08-213-9/+7
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-212-5/+4
| |\ \
| | * | Fixing compile issue on platforms other than Symbian.Aleksandar Sasha Babic2009-08-211-4/+4
| | * | Remove QtScript from deployed libraries.axis2009-08-211-1/+0
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-218-88/+14
| |\ \ \ | | |/ /
| | * | compile again after mergeHarald Fernengel2009-08-218-88/+14
| * | | Merge commit 'qt/master'Jason Barron2009-08-2121-21/+4976
| |\ \ \ | | |/ / | |/| |
| | * | Handle Touch* events in the same way as other input events in QAbstractScroll...Bradley T. Hughes2009-08-211-0/+7
| | * | Convert the screen cursor image to native premultiplied formatPaul Olav Tvete2009-08-211-1/+21
| | * | Allow linuxfb device names like /dev/fb/0Takumi ASAKI2009-08-211-9/+7
| | * | Avoid painting window decorations flicker showPaul Olav Tvete2009-08-211-6/+9
| | * | Fix blend function crash on AVR32Paul Olav Tvete2009-08-211-2/+2
| | * | make the new anchor layout code compile with namespaceshjk2009-08-216-5/+29
| | * | Merge branch 'anchorlayout' of git@gitorious.org:+openbossa-developers/qt/ope...Jan-Arve Sæther2009-08-2116-3/+4906
| | |\ \
| | | * | Remove the anchorlayoyt example that can load layouts.Jan-Arve Sæther2009-08-2014-1759/+0
| | | * | Add the autotest to auto.proJan-Arve Sæther2009-08-201-1/+2
| | | * | Implement the functions we added in the API review:Jan-Arve Sæther2009-08-194-26/+95
| | | * | update API to what was agreed on the API review meeting yesterday:Jan-Arve Sæther2009-08-199-496/+584
| | | * | Fix one "failure" on the mac.Jan-Arve Sæther2009-08-191-0/+3
| | | * | Only compile in toString() functions if we are compiling in debug mode.Jan-Arve Sæther2009-08-183-15/+32
| | | * | Improved internal docs for simplification.Jan-Arve Sæther2009-08-181-29/+44
| | | * | Remove some warningsJan-Arve Sæther2009-08-182-2/+2
| | | * | Remove some warningsJan-Arve Sæther2009-08-181-2/+0
| | | * | Just a small improvement to SequentialAnchorData::updateChildrenSizes()Jan-Arve Sæther2009-08-181-33/+20
| | | * | Fix a potential crash in AnchorVertex::toString().Jan-Arve Sæther2009-08-181-5/+6
| | | * | QGraphicsAnchorLayout: fix calculation of sizeAt* values for SequentialCaio Marcelo de Oliveira Filho2009-08-182-11/+75
| | | * | QGraphicsAnchorLayout: missing restoreSimplifiedGraph callCaio Marcelo de Oliveira Filho2009-08-171-0/+2
| | | * | QGraphicsAnchorLayout: add QT_ANCHORLAYOUT_NO_SIMPLIFICATION backCaio Marcelo de Oliveira Filho2009-08-171-0/+4
| | | * | QGraphicsAnchorLayout: hide some debug messagesCaio Marcelo de Oliveira Filho2009-08-171-0/+8
| | | * | QGraphicsAnchorLayout: add names to items in examplesCaio Marcelo de Oliveira Filho2009-08-171-33/+33
| | | * | QGraphicsAnchorLayout: calculate vertex positions with simplified graphCaio Marcelo de Oliveira Filho2009-08-174-33/+100
| | | * | Fill in some missing pieces in the documentation.Jan-Arve Sæther2009-08-171-1/+121
| | | * | Clean up exampleJan-Arve Sæther2009-08-172-151/+6
| | | * | More tests for setSpacingJan-Arve Sæther2009-08-171-0/+15