summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'QT-4077-fix' into 4.7-s60axis2010-11-056-7/+102
|\
| * Fixed test after the fix to QT-4077.axis2010-11-051-2/+2
| * Fixed event starvation with pointer events on Symbian.axis2010-11-055-5/+100
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-046-38/+10
|\ \
| * | Remove code changes that were NOT intended as part of the fixSami Merila2010-11-042-19/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-043-19/+7
| |\ \
| | * | Use qtmain.lib to provide entry point for all Symbian applicationsMiikka Heikkinen2010-11-043-19/+7
| * | | Wordwrap QInputDialog label in SymbianJanne Koskinen2010-11-041-0/+3
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-047-295/+353
|\ \ \ | |/ / |/| |
| * | Fix bearermonitor when building for Maemo in scratchbox.Aaron McCarthy2010-11-047-295/+353
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-0310-25/+66
|\ \
| * | The lastCenterPoint should be equal to centerPoint for new gestures.Frederik Gladhorn2010-11-031-3/+5
| * | PinchGesture: lastRotationAngle should start at 0.Frederik Gladhorn2010-11-031-1/+1
| * | tst_qnetworkreply: Add testcase for unknown authentication methodMarkus Goetz2010-11-031-0/+32
| * | QNAM: Reset authenticator state properly between requestsMarkus Goetz2010-11-032-3/+14
| * | msvc: enable unreferenced code elimination in release with debuginfo buildsOswald Buddenhagen2010-11-034-4/+4
| * | exclude headers in builddir from -copy optionOswald Buddenhagen2010-11-031-1/+1
| * | more elegant treatment of qconfig.h special caseOswald Buddenhagen2010-11-031-5/+7
| * | simplify recursive symlinkingOswald Buddenhagen2010-11-021-8/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-0310-50/+159
|\ \ \
| * | | qdoc: Added next and previous links to top of pages.Martin Smith2010-11-031-3/+1
| * | | Doc: style tuningMorten Engvoldsen2010-11-031-1/+1
| * | | Doc: fixing style - tool buttons to bold.Morten Engvoldsen2010-11-031-1/+1
| * | | Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
| * | | Doc: Fixing columns to display all elements in lists - css3Morten Engvoldsen2010-11-031-2/+2
| * | | Doc: fixing bugs in styleMorten Engvoldsen2010-11-022-2/+7
| * | | Doc: fixing style for search display and slim fit menusMorten Engvoldsen2010-11-021-3/+73
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-0180-5677/+12165
| |\ \ \
| * | | | Doc: Fixing bug in sorting script for search results.Morten Engvoldsen2010-11-011-3/+3
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-304-12/+53
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-29607-54610/+33052
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-292-2/+3
| |\ \ \ \ \ \
| * | | | | | | Doc: Fixed basic language.David Boddie2010-10-291-1/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-27120-392/+824
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-25137-4616/+4735
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Added Windows Vista to the trademark list.David Boddie2010-10-221-3/+3
| * | | | | | | | | Doc: Updated the Java trademark information.David Boddie2010-10-221-3/+3
| * | | | | | | | | Doc: Moved QFileSystemModel example code to the class documentation.David Boddie2010-10-212-30/+34
| * | | | | | | | | Doc: Corrected the name property as it was incorrectly declared.David Boddie2010-10-211-1/+1
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-034-3/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Qt/Symbian: QInputDialog layout and size are wrongSami Merila2010-11-034-3/+25
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-035-27/+43
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | make the dtd reflect realityOswald Buddenhagen2010-11-021-18/+5
| * | | | | | | | Fixed destination path for the S60 feedback plugin.David Boddie2010-11-021-0/+2
| * | | | | | | | german translation: minor additions + fixesFrederik Schwarzer2010-11-022-7/+34
| * | | | | | | | fix qdoc doc generationOswald Buddenhagen2010-11-011-2/+2
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-018-81/+376
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-018-81/+376
| |\ \ \ \ \ \ \ \ |/ / / / / / / / /
| * | | | | | | | QNAM HTTP: tst_qnetworkreply with setReadBufferSize() setDavid Faure2010-11-011-71/+366
| * | | | | | | | Fix compilation on AIX 5.3 with gccKent Hansen2010-11-011-1/+1