summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* qdoc3: Build fix for regression in f321a3f2b1eAndreas Kling2010-06-222-4/+4
* Clean up HB_Anchor's DeviceTables on failure when loading format 3Andreas Kling2010-06-221-1/+2
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-221456-37965/+30385
|\
| * Make sure ValueRecord's DeviceTables is cleaned up on failureAndreas Kling2010-06-221-2/+3
| * qdoc3: Build fix for regression in e2f0e728eAndreas Kling2010-06-223-6/+5
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-211457-37966/+30386
| |\
| | * Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanupAndreas Kling2010-06-211-1/+1
| | * Fix null HB_Device** dereference on exit in Harfbuzz GPOS codeAndreas Kling2010-06-213-16/+20
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-2164-341/+1420
| | |\
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-219-54/+137
| | | |\
| | | | * Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.Friedemann Kleint2010-06-211-1/+16
| | | | * Fix for a leak in the mac style.Denis Dzyubenko2010-06-211-1/+1
| | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-06-2128-143/+606
| | | | |\
| | | | * | Doc: Fixing bugs to style and scriptMorten Engvoldsen2010-06-217-52/+120
| | | * | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-212-5/+74
| | | | |/ | | | |/|
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-21891-23477/+23546
| | | |\ \
| | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-06-211428-29720/+32668
| | | | |\ \
| | | | | * | Fix compiler warnings in QtGui (text,painting).Friedemann Kleint2010-06-213-8/+7
| | | | | * | Allow Unix to generate unique UUIDs if /dev/urandom exists.Darin Broady2010-06-211-23/+35
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-21863-23337/+22620
| | | | | |\ \ | | | | | | |/
| | | | | | * Allow GNU Free Documentation license header.Jason McDonald2010-06-211-1/+1
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jason McDonald2010-06-2116-99/+541
| | | | | | |\
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-21861-23336/+22578
| | | | | | | |\
| | | | | | * | | Add missing license header.Jason McDonald2010-06-211-0/+41
| | | | | | | |/ | | | | | | |/|
| | | | | | * | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b6...Simon Hausmann2010-06-203-33/+8
| | | | | | * | Fix example compile and runtime warnings, webkit examples not built.Friedemann Kleint2010-06-186-6/+12
| | | | * | | | Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()Andy Shaw2010-06-212-1/+23
| | | * | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-214-18/+60
| | * | | | | | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-21578-14522/+7428
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-18117-669/+2146
| | |\ \ \ \ \
| | | * | | | | qgl_cl_p.h is no longer existentluohua2010-06-181-1/+0
| | | * | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f5...Simon Hausmann2010-06-182-17/+31
| | | |/ / / /
| | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-1847-273/+543
| | | |\ \ \ \
| | | | * | | | doc: Fixed type of Package::nameThorbjørn Lindeijer2010-06-181-1/+1
| | | | * | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 508b02a25...Simon Hausmann2010-06-185-70/+72
| | | | * | | | Fix for emitting changed signal in QClipboardDenis Dzyubenko2010-06-181-2/+2
| | | | * | | | Fixed tst_QNetworkDiskCache creating badly named directories.Rohan McGovern2010-06-171-1/+1
| | | | * | | | Specialize peek() for QBufferAndreas Kling2010-06-173-19/+52
| | | * | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-183-5/+47
| | * | | | | | Merge commit 'refs/merge-requests/691' of git://gitorious.org/qt/qt into inte...David Boddie2010-06-181-20/+23
| | |\ \ \ \ \ \
| | | * | | | | | Documentation changes to QTextLayout.Robin Burchell2010-06-151-20/+23
| | * | | | | | | Doc: Fixed documentation errors.David Boddie2010-06-184-7/+7
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-16418-5611/+6796
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-10136-932/+2231
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Doc: Updated example license to three clause BSD license.David Boddie2010-06-10833-23177/+22345
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-225-10/+11
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-215-10/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Compiler warnings (unused variables).Bjørn Erik Nilsen2010-06-211-3/+0
| | * | | | | | | | | | Compiler warnings.Bjørn Erik Nilsen2010-06-212-3/+3
| | * | | | | | | | | | Fix crash with large ClientCutMessagePaul Olav Tvete2010-06-211-1/+1