summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-23297-2778/+2542
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-2333-111/+190
| |\
| | * QSortFilterProxyModel: Sorting occured unnecessarily when the dynamicSortFilt...Olivier Goffart2010-02-222-8/+38
| | * Fix test with gcc 4.0 where QT_USE_FAST_CONCATENATION cannot be enabled.Olivier Goffart2010-02-221-3/+11
| | * Fix build with wingwThierry Bastian2010-02-222-6/+6
| | * Imporve win64 support for mingwThierry Bastian2010-02-2213-68/+61
| | * CompilePaul Olav Tvete2010-02-221-1/+1
| | * Fix a memory hole in QGraphicsItemPrivate.Alexis Menard2010-02-221-5/+6
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-23277-2687/+2419
| |\ \
| | * | 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-qmlAlan Alpert2010-02-225-0/+5
| | |\ \
| | | * | Updated based on change to transformOrignNigel Hietala2010-02-225-0/+5
| | * | | Documentation UpdateAlan Alpert2010-02-221-1/+5
| | |/ /
| | * | Doc fixAlan Alpert2010-02-221-1/+1
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-22947-72470/+61700
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-22268-2665/+2384
| | | |\ \ | | |/ / / | |/| | |
| | | * | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-22113-2218/+1931
| | * | | Remove race condition in remote pixmap cancelling.Martin Jones2010-02-221-17/+12
| | |/ /
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-221-0/+5
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-2210-93/+83
| | | |\ \
| | | * | | Update QmlChanges with animation API changes.Michael Brasser2010-02-221-0/+5
| | * | | | Rename MouseRegion -> MouseAreaMartin Jones2010-02-22144-307/+310
| | | |/ / | | |/| |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2217-90/+89
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-2212-47/+55
| | | |\ \ \ | | | | |/ /
| | | | * | Increase durations when testing Behaviors.Michael Brasser2010-02-2210-24/+24
| | | * | | Fix compile error on SolarisAaron Kennedy2010-02-227-66/+65
| | * | | | Document the default velocity of EaseFollowMartin Jones2010-02-221-1/+10
| | * | | | Remove use of unexprted private classes.Martin Jones2010-02-222-26/+8
| | | |/ / | | |/| |
| | * | | Add cached path rounded rect painting benchmark.Martin Jones2010-02-221-0/+24
| | * | | Remove use of direct event posting. Use QTest::keyClick() for keys.Martin Jones2010-02-221-23/+7
| | |/ /
* | | | Fix GL viewports under -graphicssystem raster.Gunnar Sletta2010-02-231-2/+3
| |_|/ |/| |
* | | 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-2212-17/+58
| |\ \ \ | | |/ / | |/| |
| | * | 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 compilationOlivier Goffart2010-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-221805-77748/+127519
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-227-12/+53
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtRhys Weatherley2010-02-2117-553/+204
| | |\ \ \ | | | |/ /
| | * | | 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