summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
* 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
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2118-93/+481
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Start the implementation of in-place recoding for imagesBenjamin Poulain2010-06-2012-95/+436
| | | | * | Fix a possible crash with the EVR video renderer in windowsThierry Bastian2010-06-181-7/+9
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-176-7/+52
| | | | |\ \
| | | | | * | Don't do opaque detection when copying a sub-rect of a QPixmap.Samuel Rødal2010-06-171-1/+1
| | | | | * | Optimized QPixmap::fromImage for raster pixmaps.Samuel Rødal2010-06-171-3/+16
| | | | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-06-17243-5030/+7796
| | | | | |\ \
| | | | | | * | Typo in qcleanlooksstyle.cppOlivier Goffart2010-06-171-1/+1
| | | | | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-06-17242-5029/+7795
| | | | | | |\ \
| | | | | | | * | Speed up calls to QPainter::setCompositionMode when the mode is unchangedSimon Hausmann2010-06-171-0/+2
| | | | | * | | | Doc: Small change to QAbstractItemDelegate::editorEvent()Geir Vattekar2010-06-171-2/+8
| | | | | |/ / /
| | | | | * | | Doc: Specified QAbstractEventDispatcher::filterEvent()'s argument types.Geir Vattekar2010-06-171-0/+24
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-1716-99/+541
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Updated WebKit to 6623b5da196390748dc619461739f9cb84524736Simon Hausmann2010-06-1716-99/+541
| | * | | | | | 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
| | | |/ / / / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1726-67/+623
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-174-7/+56
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-164-7/+56
| | | |\ \ \ \ \
| | | | * | | | | Provide 'make unsigned_sis' target for Symbian mkspecsMiikka Heikkinen2010-06-164-7/+56
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1723-134/+260
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |