summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Optimized pixmapcache key generation for icons and stylesOlivier Goffart2010-05-174-69/+59
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1744-590/+1020
|\
| * Empty commit to trigger a rebuild in the CI systemThiago Macieira2010-05-160-0/+0
| * Use case-insensitive comparison for the "data" scheme in URLsThiago Macieira2010-05-151-1/+1
| * tst_bic: Fix building on Mac 64Thiago Macieira2010-05-151-1/+1
| * Fix building of tst_QTcpSocketThiago Macieira2010-05-151-2/+2
| * Autotest: some improvements to timeout testing of tst_QTcpSocketThiago Macieira2010-05-151-4/+22
| * Revert "Optimized pixmapcache key generation for icons and styles"Thiago Macieira2010-05-153-48/+65
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1544-649/+1044
| |\ |/ /
| * Revert "More improvements to pixmap cache key generation"Thiago Macieira2010-05-144-57/+50
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1445-653/+1055
| |\
| | * More improvements to pixmap cache key generationJens Bache-Wiig2010-05-144-50/+57
| | * More 4.7 stuff.Trond Kjernåsen2010-05-141-0/+3
| | * Fix for autotest failure in qwidget::saveRestoreGeometry()Carlos Manuel Duclos Vergara2010-05-141-1/+1
| | * Optimized pixmapcache key generation for icons and stylesJens Bache-Wiig2010-05-143-65/+48
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-1472-1245/+2050
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1431-446/+852
| | | |\
| | | | * Mac: restoreGeometry()Carlos Manuel Duclos Vergara2010-05-143-3/+48
| | | | * [Regression] Build failure on Mac CarbonCarlos Manuel Duclos Vergara2010-05-141-0/+2
| | * | | doc: Another upgrade of the top page and overviews.Martin Smith2010-05-1412-138/+141
| | | |/ | | |/|
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-141-4/+21
| | |\ \
| | | * | Some 4.7 changes.Trond Kjernåsen2010-05-141-4/+9
| | | * | Updated changelog.Yoann Lopes2010-05-141-0/+12
| | * | | doc: Added some \briefs to how-to docs.Martin Smith2010-05-1411-19/+28
| | |/ /
| | * | Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squashAaron McCarthy2010-05-14448-3303/+7308
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-05-14626-5482/+11067
| | | |\ \
| | | * | | Added snippet labels to QML Dial example.Peter Yard2010-05-142-2/+14
| | | * | | Fixed documentation typo.Peter Yard2010-05-141-1/+1
| | * | | | Cherry pick fix for MOBILITY-932 from Qt Mobility.Aaron McCarthy2010-05-141-18/+14
| | * | | | Cherry pick fix for MOBILITY-962 from Qt Mobility.Aaron McCarthy2010-05-141-4/+14
| | * | | | Cherry pick fix for MOBILITY-828 from Qt Mobility.Aaron McCarthy2010-05-142-6/+28
| | * | | | Bearer management changes from Qt Mobility.Aaron McCarthy2010-05-145-4/+25
| | * | | | Cherry pick fix for MOBILITY-828 from Qt Mobility.Aaron McCarthy2010-05-146-386/+658
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1531-244/+718
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1431-244/+718
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Updated WebKit to 5cf023650a8da206a8cf3130e9d4820b95e1bc7cSimon Hausmann2010-05-1430-229/+718
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-144-17/+2
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dcSimon Hausmann2010-05-134-17/+2
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-158-18/+259
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-148-18/+259
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Revert "Optimize QPixmapIconEngine's pixmap() function"Olivier Goffart2010-05-141-21/+14
| * | | | | | Limit the lower glyph texture cache size to 16x16 in GL.Trond Kjernåsen2010-05-141-0/+12
| * | | | | | Added workarounds for two MBX/SGX specific GL ES bugs/problems.Trond Kjernåsen2010-05-147-18/+39
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-05-14790-7593/+15697
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev-nokia.troll.no:qt/oslo-staging-2 into 4.7Andreas Aardal Hanssen2010-05-14454-3307/+7326
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Add missing file!Andreas Aardal Hanssen2010-05-141-0/+208
| * | | | | | | Optimize QPixmapIconEngine's pixmap() functionaavit2010-05-111-14/+21
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-14166-1294/+2010
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Update the dependencies in src.pro because we don't have a good buildsystemThiago Macieira2010-05-141-5/+15
| * | | | | | | QtDeclarative doesn't use QtXml, so don't link to it or require others toThiago Macieira2010-05-141-2/+2