summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-0532-379/+631
|\
| * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-0427-370/+578
| |\
| | * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-0427-370/+578
| | |\
| | | * 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 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-044-8/+36
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Update the offsets of the QToolBars insideFabien Freling2010-11-044-8/+36
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-11-041-1/+17
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Make qmake to pass all UTF-8 characters unchanged through parser.Miikka Heikkinen2010-11-041-1/+17
* | | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-04857-59571/+55411
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-041-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-031-0/+8
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix compilation for when there is no OpenGL moduleaavit2010-11-031-0/+8
| * | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-049-30/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-039-30/+68
| | |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| | * | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-039-30/+68
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | 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