summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow QT_TR_NOOP (as a no-op) in ListModel values.Warwick Allison2010-06-222-7/+16
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2129-109/+282
|\
| * Avoid printing a warningAlan Alpert2010-06-211-1/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-2163-243/+1322
| |\
| | * Fix testBea Lam2010-06-181-0/+3
| | * ListView doc improvements and examples clean upBea Lam2010-06-1811-34/+53
| | * 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-1713-49/+202
| | |\
| | | * 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
| | | |\
| | | * | doc: improve Repeater model docs.Martin Jones2010-06-171-10/+3
| | | * | doc: couple more performance tips.Martin Jones2010-06-171-0/+12
| * | | | Only steal hover events when enabled, in QtDemo's qml integrationAlan Alpert2010-06-211-1/+1
| * | | | Allow things that load SameGame to disable the Quit buttonAlan Alpert2010-06-213-0/+4
| * | | | Seems to fix the keyboard focus confusionAlan Alpert2010-06-211-2/+5
| | |_|/ | |/| |
| * | | BorderImage is not updated when border values changeYann Bodson2010-06-173-1/+16
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1763-391/+1181
| |\ \
| | * | Auto test for QTBUG-11507Bea Lam2010-06-173-0/+28
| | * | Properly update childrenRect for position changes and shrinking.Michael Brasser2010-06-173-5/+84
| * | | 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-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
| | |_|_|/ | |/| | |
* | | | | 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 git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-179-22/+263
| |\ \ \ \ \
| | * | | | | Usefully convert from QtScript object/array to QVariantKent Hansen2010-06-178-22/+257
| | * | | | | document QSslSocket::systemCaCertificates() change in changelogPeter Hartmann2010-06-171-0/+6
| * | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-172-11/+105
| |/ / / / /
| * | | | | 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-1615-38/+243
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-1666-530/+733
| | |\ \ \ \ \
| | | * | | | | 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
| | | * | | | | qmake: Fix CONFIG += exceptions_off with the MSVC project generator.Jocelyn Turcotte2010-06-162-2/+6
| | | * | | | | Fix some kind of race condition while using remote commands.kh12010-06-162-2/+24
| | | * | | | | 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