summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | 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
| | | | | | |_|_|/ / / / | | | | | |/| | | | | |
| | | | | * | | | | | | 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 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
| | | * | | | | | | | | | | | | 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
| | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | 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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-223-27/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Moved QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR to symbian.confMiikka Heikkinen2010-06-222-2/+5
| | * | | | | | | | | | | | | | Fix precompiled binary deploymentMiikka Heikkinen2010-06-221-25/+28
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2299-7343/+2341
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix WebKit declarative examples (second try)Simon Hausmann2010-06-221-1/+1
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2298-7342/+2340
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2298-7342/+2340
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Fix examplesSimon Hausmann2010-06-216-6/+6
| | | * | | | | | | | | | | | Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cdSimon Hausmann2010-06-2133-322/+996
| | | * | | | | | | | | | | | Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066dSimon Hausmann2010-06-217-39/+98
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2162-6990/+1255
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-2029-5961/+0
| | | | * | | | | | | | | | | Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-194-3/+17
| | | | * | | | | | | | | | | Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aefSimon Hausmann2010-06-184-5/+13
| | | | * | | | | | | | | | | Update S60 stuff after renaming the webkit component.Alexis Menard2010-06-182-5/+5
| | | | * | | | | | | | | | | Update qmlchanges from import org.webkit to QtWebKitAlexis Menard2010-06-181-1/+1
| | | | * | | | | | | | | | | Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749aSimon Hausmann2010-06-1813-16/+265
| | | | * | | | | | | | | | | Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5Simon Hausmann2010-06-185-4/+20