summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2326-47/+137
|\
| * Remove active qDebugs.Justin McPherson2010-02-2312-42/+38
| * Player demo updated with more user-friendly previous button behaviour.Nicholas Young2010-02-232-1/+13
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingNicholas Young2010-02-2318-28/+212
| |\
| | * Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.Justin McPherson2010-02-234-4/+4
| | * Add private header warning.Justin McPherson2010-02-235-0/+54
| * | Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-233-0/+28
* | | 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
* | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-232-1/+15
|\ \ \ \
| * \ \ \ Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-222-1/+15
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge remote branch 'origin/master' into integration-master-from-4.6Rohan McGovern2010-02-221-1/+1
| | |\ \ \ | | | |/ /
| | * | | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-222-1/+15
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-222-1/+15
| | | |\ \
| | | | * | Don't process uic3 subdir if qt3support is disabled.Rohan McGovern2010-02-221-1/+3
| | | | * | Fixed failure of tst_symbols when Qt is configured with -qtnamespaceRohan McGovern2010-02-221-0/+12
| | | |/ /
* | | | | 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
* | | | | | 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
* | | | | | | 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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20302-68221/+34221
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-20356-6032/+7175
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20302-68220/+34223
| | |\ \ \ \ \ \
| * | | | | | | | Compile fix for symbianaavit2010-02-201-5/+2
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'rtiff392'aavit2010-02-20170-62706/+9373
| |\ \ \ \ \ \ \
generated by cgit v0.12 at 2025-01-25 02:40:19 (GMT)