summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-163-2/+15
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-161-2/+2
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-06-168-93/+57
| | | | | |\ \ \ | | | | | | |/ /
| | | | | * | | Audio (osx); In pull mode emit readyRead() for each period received.Justin McPherson2010-06-161-2/+2
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2110-83/+121
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | ListView doc improvements and examples clean upBea Lam2010-06-181-12/+25
| * | | | | | | Doc fixesBea Lam2010-06-182-23/+13
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-177-48/+83
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix event forwarding in QDeclarativeFlickable.Alexis Menard2010-06-171-3/+18
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-173-1/+16
| | |\ \ \ \ \ \
| | | * | | | | | BorderImage is not updated when border values changeYann Bodson2010-06-173-1/+16
| | * | | | | | | doc: improve Repeater model docs.Martin Jones2010-06-171-10/+3
| | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1745-312/+658
| | |\ \ \ \ \ \
| | | * | | | | | Properly update childrenRect for position changes and shrinking.Michael Brasser2010-06-171-4/+5
| | | |/ / / / /
| | * | | | | | XmlListModel: Don't lock while doing the slow bit.Martin Jones2010-06-171-30/+41
* | | | | | | | 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
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | 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
| | * | | | | | | Work around ICE in Intel C++ Compiler 11.1.072Thiago Macieira2010-06-161-1/+1
| | * | | | | | | Reduce the memory consumption of QtFontStyleBenjamin Poulain2010-06-161-4/+9
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |