summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Use case-insensitive comparison for the "data" scheme in URLsThiago Macieira2010-05-151-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-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-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
* | | | | | 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
* | | | | | Rename QML Runtime (executable) to QML LauncherKai Koehne2010-05-141-0/+5
* | | | | | Fix compilation of QtDeclarative module (gcc)Kai Koehne2010-05-141-1/+1
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1428-247/+789
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Qt.include() support in worker scriptsAaron Kennedy2010-05-144-1/+69
| * | | | | Only add "include" property in non-workerscript threadsAaron Kennedy2010-05-141-1/+2
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-141-4/+8
| |\ \ \ \ \
| | * | | | | Reduce the chance of AnchorAnimation animating geometry changes itMichael Brasser2010-05-141-4/+8
| * | | | | | Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89Aaron Kennedy2010-05-148-9/+63
| |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1459-545/+1033
| |\ \ \ \ \
| | * | | | | Fix crash in ParentAnimation.Michael Brasser2010-05-146-13/+16
| | * | | | | Revert "Fix crash in ParentAnimation."Michael Brasser2010-05-141-9/+8
| | * | | | | Fix crash in ParentAnimation.Michael Brasser2010-05-141-8/+9
| | * | | | | Minor declarative webview tweaksAlan Alpert2010-05-131-2/+5
| | * | | | | Removed dependency of QDeclarativeWebView to private Qt (Declarative) APISimon Hausmann2010-05-132-163/+106
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-1376-492/+1135
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1310-59/+155
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | * | | | Follow-up on Flickable changes.Yann Bodson2010-05-135-44/+94
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-133-3/+38
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-131-10/+18
| | | | | |\ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-1343-367/+609
| | | | | |\ \ \ \ \
| | | | | * | | | | | Add an example spinner.Martin Jones2010-05-133-3/+38
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1327-136/+251
| | | | |\ \ \ \ \ \ \ | | | | | | |_|/ / / / | | | | | |/| | | | |