summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| | * | | | | Add libjpeg 8aavit2010-02-16137-0/+53170
| | * | | | | Delete libjpeg 6baavit2010-02-1690-33896/+0
* | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-20488-1815/+24680
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Assistant: Remove 'namespace qt' from new files in 4.7Thiago Macieira2010-02-203-6/+0
| * | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-20485-1809/+24680
| |\ \ \ \ \ |/ / / / / /
| * | | | | Doc: these files are NOT part of the test suite of the Qt toolkitThiago Macieira2010-02-2046-46/+46
| * | | | | Autotest: make the licenseCheck test also check .qdoc filesThiago Macieira2010-02-201-0/+12
| * | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-20782-16228/+102444
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-2056-435/+3874
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-196-65/+344
| | |\ \ \ \ \
| | | * | | | | Fixed off-by-one blending errors in the NEON drawhelper code.Samuel Rødal2010-02-191-65/+65
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-195-0/+279
| | | |\ \ \ \ \
| | | | * | | | | Cetest extensions for Windows Mobile device power operations.ninerider2010-02-193-0/+190
| | | | * | | | | Remote lib extensions for Windows Mobile device power operations.ninerider2010-02-192-0/+89
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-1947-360/+3401
| | |\ \ \ \ \ \ \
| | | * | | | | | | use egl properties when creating surfaces on symbianLars Knoll2010-02-191-2/+2
| | | * | | | | | | work around the current include file structure on Symbian^3Lars Knoll2010-02-191-0/+4
| | | * | | | | | | Get rid of the dependency on the Symbian app layerLars Knoll2010-02-191-1/+3
| | | * | | | | | | Fix incorrect license headersGareth Stockwell2010-02-1910-10/+10
| | | * | | | | | | Merge branch '4.6' of S:\dynamic\git\qt\trolltech\qt-s60-public.git\ into 4.6Gareth Stockwell2010-02-192-8/+25
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Supressed Icon sizes on QPushButton in QS60StyleSami Merila2010-02-191-2/+12
| | | | * | | | | | | Fixed libstdcpp.dll version autodetection for SymbianMiikka Heikkinen2010-02-191-6/+13