summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fix platform regression: Support QFont::setStretch() on CocoaEskil Abrahamsen Blomfeldt2010-05-192-6/+15
* Fix a memory leak from QItemSelectionModel when changing the modelThierry Bastian2010-05-191-1/+5
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-05-19333-4865/+8004
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-174-69/+60
| |\
| | * Compile with Gcc 4.1Olivier Goffart2010-05-171-0/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-174-69/+59
| | |\
| | | * Optimized pixmapcache key generation for icons and stylesOlivier Goffart2010-05-174-69/+59
| * | | Compile fixes.ck2010-05-171-0/+1
| |/ /
| * | Move Q_ENUMS to start of class declarationAaron Kennedy2010-05-172-3/+3
| * | Restructure QDeclarativeAbstractBinding destructorAaron Kennedy2010-05-171-2/+4
| * | Don't call pure virtual method in ~QDeclarativeAbstractBinding()Aaron Kennedy2010-05-171-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1758-606/+1538
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1719-95/+302
| | |\ \ | | | |/ | | |/|
| | | * Focus should be applied to focus scopes all the way up the chain, notBea Lam2010-05-172-6/+2
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1710-75/+264
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-1710-17/+15
| | | | |\
| | | | * | Don't crash due to recursive positioning.Martin Jones2010-05-172-25/+40
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-17129-699/+1656
| | | | |\ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-146-16/+18
| | | | |\ \ \
| | | | * | | | Add a "priority" property to Keys and KeyNavigationMartin Jones2010-05-147-45/+222
| | | * | | | | Fix doc for status, add Image::onLoaded.Warwick Allison2010-05-172-2/+23
| | * | | | | | Use case-insensitive comparison for the "data" scheme in URLsThiago Macieira2010-05-161-1/+1
| | * | | | | | 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-1511-330/+529
| | |\ \ \ \ \ \
| | | * | | | | | 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-1412-334/+540
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | | * | | | | More improvements to pixmap cache key generationJens Bache-Wiig2010-05-144-50/+57
| | | | * | | | | 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 scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-148-265/+481
| | | | |\ \ \ \ \
| | | | | * | | | | Mac: restoreGeometry()Carlos Manuel Duclos Vergara2010-05-143-3/+48
| | | | | * | | | | [Regression] Build failure on Mac CarbonCarlos Manuel Duclos Vergara2010-05-141-0/+2
| | | | | * | | | | Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squashAaron McCarthy2010-05-14177-977/+2332
| | | | | |\ \ \ \ \
| | | | | * | | | | | Cherry pick fix for MOBILITY-932 from Qt Mobility.Aaron McCarthy2010-05-141-18/+14
| | | | | * | | | | | Cherry pick fix for MOBILITY-828 from Qt Mobility.Aaron McCarthy2010-05-141-2/+2
| | | | | * | | | | | Cherry pick fix for MOBILITY-828 from Qt Mobility.Aaron McCarthy2010-05-144-243/+416
| | * | | | | | | | | 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-1531-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-147-18/+51
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | 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-14280-4022/+5626
| | | |\| | | | | | | |
| | | * | | | | | | | | Optimize QPixmapIconEngine's pixmap() functionaavit2010-05-111-14/+21
| * | | | | | | | | | | Check for acquireReg() failureAaron Kennedy2010-05-171-0/+27
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | ListModel::get() shouldn't print warnings for invalid indices since itBea Lam2010-05-171-4/+1
| * | | | | | | | | | Add \brief to TextInputBea Lam2010-05-171-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |