summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-23277-2687/+2419
|\
| * 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
| | |/
* | | Make compile on Maemo6.Aaron McCarthy2010-02-233-9/+16
* | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2315-28/+158
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-22131-117/+23077
| |\ \ \ | | |/ / | |/| |
| * | | 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-221-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
| | |\ \ \
| | | * \ \ 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
* | | | | | | Fix build on Symbian.Aaron McCarthy2010-02-233-2/+12
| |_|_|_|/ / |/| | | | |
* | | | | | Change initialization order.Aaron McCarthy2010-02-221-1/+1
* | | | | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221-0/+1
|\ \ \ \ \ \
| * | | | | | Fixed qnetworksession test on Mac.Rohan McGovern2010-02-211-0/+1
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-21129-115/+22880
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-21129-115/+22880
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | | |\ \ \
| | | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | | * | Merge remote branch 'origin/master' into mobility-masterRohan McGovern2010-02-191227-17914/+115112
| | | | | | |\ \ | | | | | | | |/
* | | | | | | | Increase try verify timeout.Aaron McCarthy2010-02-222-2/+2
* | | | | | | | Add locking to bearer code.Aaron McCarthy2010-02-2214-103/+297
* | | | | | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221980-72198/+158783
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-2117-553/+204
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-219-258/+100
| | * | | | | Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-2113-297/+106
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-21302-68221/+34221
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |