summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2214-27/+157
|\
| * Documentation fixes.Justin McPherson2010-02-227-18/+22
| * Add a qRegisterQmlElements function to QtMultimediaJustin McPherson2010-02-227-9/+135
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-211-1/+1
|\ \ | |/ |/|
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-211-1/+1
| |\
| | * QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.Daniel Molkentin2010-02-211-1/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20301-68181/+34136
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-20124-1985/+3019
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20301-68180/+34138
| | |\ \ | | | |/ | | |/|
| * | | Compile fix for symbianaavit2010-02-201-5/+2
| | |/ | |/|
| * | Merge branch 'rtiff392'aavit2010-02-20169-62667/+9295
| |\ \
| | * | Our configuration and build modifications to libtiffaavit2010-02-166-1/+454
| | * | Add libtiff 3.9.2aavit2010-02-16209-0/+68942
| | * | Delete libtiff 3.8.2aavit2010-02-11243-122767/+0
| * | | Merge branch 'rjpeg8'aavit2010-02-20132-5513/+24843
| |\ \ \
| | * | | Update license doc, .pro file and qjpeghandler for libjpeg 8aavit2010-02-162-5/+10
| | * | | Our configuration and build modifications to libjpegaavit2010-02-162-2/+53
| | * | | Add libjpeg 8aavit2010-02-16137-0/+53170
| | * | | Delete libjpeg 6baavit2010-02-1690-33896/+0
* | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-20487-12273/+86562
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1921-70/+259
| |\ \ \ \
| | * | | | Add convenience function QTextCursor::positionInBlock()mae2010-02-192-1/+26
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1819-69/+233
| | |\ \ \ \
| | | * | | | optimize qstring::simplified()Oswald Buddenhagen2010-02-181-16/+66
| | | * | | | Revert optimizations to QString::appendKai Koehne2010-02-182-42/+4
| | | * | | | unbreak QList::append() and co. againOswald Buddenhagen2010-02-171-1/+1
| | | * | | | optimization: use QList::reserve() and QVector::reserve()Oswald Buddenhagen2010-02-171-1/+3
| | | * | | | Added QPlainTextEditor::anchorAt(const QPoint &pos)Thorbjørn Lindeijer2010-02-172-0/+22
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1716-56/+184
| | | |\ \ \ \
| | | | * | | | avoid double reallocations in appending operationsOswald Buddenhagen2010-02-162-4/+42
| | | | * | | | avoid double reallocation in string-growing replace() caseOswald Buddenhagen2010-02-161-1/+2
| | | | * | | | optimize qHash() some moreOswald Buddenhagen2010-02-161-8/+4
| | | | * | | | optimize QList::mid()Oswald Buddenhagen2010-02-161-3/+12
| | | | * | | | optimization: use QList::reserve() in QSet::toList()Oswald Buddenhagen2010-02-161-0/+1
| | | | * | | | add QList::reserve()Oswald Buddenhagen2010-02-162-8/+57
| | | | * | | | optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-1610-30/+29
| | | | * | | | add QString(const QChar *) c'torOswald Buddenhagen2010-02-162-2/+37
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-19103-1915/+2760
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Revert "Speed up QmlGraphicsItem::setParentItem."Bjørn Erik Nilsen2010-02-191-5/+1
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-191-3/+6
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-192-8/+1
| | | |\ \ \ \ \ \
| | | * | | | | | | Delete the QmlImageRequestHandler in the correct thread.Martin Jones2010-02-191-3/+6
| | * | | | | | | | More strict type checking of ListElement properties.Warwick Allison2010-02-192-10/+40
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Fix "AnimatedImage ignores Anchors setting"Michael Brasser2010-02-191-0/+1
| | * | | | | | | Remove unused function that breaks build on AIX.Michael Brasser2010-02-191-8/+0
| | |/ / / / / /
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-18347-561/+954
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Make QmlDom API internalKai Koehne2010-02-185-409/+420
| | * | | | | | Compile fix with namepaceshjk2010-02-183-1/+9
| | * | | | | | Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transitionLeonardo Sobral Cunha2010-02-181-1/+0
| | * | | | | | Doc: onExited, onEntered only work when button pressed or hoverEnabledMartin Jones2010-02-181-0/+16