summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Imporve win64 support for mingwThierry Bastian2010-02-2213-68/+61
* Fix a memory hole in QGraphicsItemPrivate.Alexis Menard2010-02-221-5/+6
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-2216-29/+161
|\
| * Compilation fix for Symbianaavit2010-02-221-1/+3
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-2211-16/+57
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-221-1/+1
| | |\
| | * | Compilation fix for AIXaavit2010-02-221-1/+1
| * | | 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
* | | | | Fix assert in fontengine when using rotated/scaled QStaticTextGunnar Sletta2010-02-221-3/+7
| |_|_|/ |/| | |
* | | | Fix build on Mac OS XGabriel de Dietrich2010-02-221-1/+1
| |_|/ |/| |
* | | Fix compilation on WindowsOlivier Goffart2010-02-221-1/+1
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-22966-71243/+79717
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-227-12/+53
| |\ \ \ | | |/ / | |/| |
| | * | Compilation on symbianOlivier Goffart2010-02-211-3/+3
| | * | Enable QT_USE_FAST_CONCATENATION by default for compiling QtOlivier Goffart2010-02-212-0/+11
| | * | Compile with QT_USE_FAST_OPERATOR_PLUSOlivier Goffart2010-02-213-4/+4
| | * | QStringBuilder: Do not resize if not required.Olivier Goffart2010-02-211-6/+22
| | * | QStringBuilder: reduce the size of the generated codeOlivier Goffart2010-02-211-0/+14
| | |/
| * | 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