summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \
| | * | | | | | | license doc updated for libtiff 3.9.2aavit2010-02-161-39/+78
| | * | | | | | | 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-20133-5520/+24856
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update license doc, .pro file and qjpeghandler for libjpeg 8aavit2010-02-163-12/+23
| | * | | | | | | | Our configuration and build modifications to libjpegaavit2010-02-162-2/+53