summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Make uncached text painting work for richtext too.Martin Jones2010-02-232-3/+12
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-22496-70205/+39384
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-2284-1649/+1338
| |\
| | * Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-2264-1432/+1123
| * | 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 remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-2025-88/+2836
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-191-65/+65
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixed off-by-one blending errors in the NEON drawhelper code.Samuel Rødal2010-02-191-65/+65
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-1922-20/+2766
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | use egl properties when creating surfaces on symbianLars Knoll2010-02-191-2/+2
| | | * | | | | | | | | | work around the current include file structure on Symbian^3Lars Knoll2010-02-191-0/+4
| | | * | | | | | | | | | Get rid of the dependency on the Symbian app layerLars Knoll2010-02-191-1/+3
| | | * | | | | | | | | | Fix incorrect license headersGareth Stockwell2010-02-1910-10/+10
| | | * | | | | | | | | | Merge branch '4.6' of S:\dynamic\git\qt\trolltech\qt-s60-public.git\ into 4.6Gareth Stockwell2010-02-191-2/+12
| | | |\ \ \ \ \ \ \ \ \ \