summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-23917-66875/+110233
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-2311-158/+236
| |\
| | * clean up x11 desktop detectionOswald Buddenhagen2010-02-222-90/+31
| | * avoid double reallocations in inserting operationsOswald Buddenhagen2010-02-222-35/+143
| | * create temporaries more intelligentlyOswald Buddenhagen2010-02-221-6/+28
| | * do not protect against self-assignment in QList::replace()Oswald Buddenhagen2010-02-221-6/+1
| | * make queues to which only lists are appended not blow the memoryOswald Buddenhagen2010-02-222-18/+19
| | * optimize queue-like structuresOswald Buddenhagen2010-02-221-3/+3
| | * remove more pointless recalculationsOswald Buddenhagen2010-02-221-3/+3
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-227-8/+19
| | |\
| | | * Fix compilation with namespace.ck2010-02-226-6/+17
| | | * Fix compilation with namespace.ck2010-02-221-2/+2
| * | | 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