summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-2135-257/+1038
|\
| * 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.7Andy Shaw2010-06-21284-4264/+4968
| |\
| | * 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-2118-151/+177
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2118-151/+177
| | | |\
| | | | * Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b6...Simon Hausmann2010-06-203-33/+8
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-2110-93/+444
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Start the implementation of in-place recoding for imagesBenjamin Poulain2010-06-204-95/+399
| | | * | 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-17128-2727/+1379
| | | | |\ \
| | | | | * | 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-17127-2726/+1378
| | | | | |\ \
| | | | | | * | 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-211-0/+2
* | | | | | | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-2138-951/+419
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-1870-476/+1003
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | 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
| * | | | | | 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-1712-42/+99
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Usefully convert from QtScript object/array to QVariantKent Hansen2010-06-173-17/+23
| | * | | | Implement QIODevice::peek() using read() + ungetBlock().Andreas Kling2010-06-162-7/+23
| | * | | | Allocate the memory for QtFontSize when count > 1Benjamin Poulain2010-06-161-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-167-18/+53
| | |\ \ \ \
| | | * | | | Defer allocation of GIF decoding tables/stack.Andreas Kling2010-06-161-2/+12
| | | * | | | Make sure only started gestures can cause cancellationsThomas Zander2010-06-161-1/+2
| | | * | | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-06-163-10/+29
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1712-55/+137
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | doc: add note that items with width or height of 0 are not positioned.Martin Jones2010-06-171-0/+8
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1773-2360/+681
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1610-54/+127
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-1639-127/+336
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-161-0/+1
| | | | | |\ \ \ \ \
| | | | | * | | | | | Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-166-15/+62
| | | | * | | | | | | Write TextInput.positionToRectangle docs.Alan Alpert2010-06-162-4/+10
| | | | * | | | | | | Fix autoScroll implementationAlan Alpert2010-06-162-35/+54
| | * | | | | | | | | clearFocus() shouldn't mess with focus if it doesn't have focusMartin Jones2010-06-171-1/+2
| | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1632-112/+273
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |