summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0592-2420/+3396
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0592-2420/+3396
| |\
| | * optimize dynamic call-by-name awaymae2010-03-052-9/+15
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0590-2411/+3381
| | |\
| | | * Add support for QtScript connect/disconnect syntax in QMLAaron Kennedy2010-03-0513-0/+427
| | | * Minor perf improvement when running QML script blocksAaron Kennedy2010-03-051-2/+3
| | | * Fix qdeclarative{audio,video} tests.Justin McPherson2010-03-054-14/+14
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0529-1672/+1990
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-0569-935/+1115
| | | | |\
| | | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-05194-2509/+2363
| | | | | |\
| | | | | * | Fix testBea Lam2010-03-051-7/+11
| | | | * | | Add basic support for explicit newParent in ParentAnimation.Michael Brasser2010-03-052-7/+57
| | | | * | | Document new ParentChange properties.Michael Brasser2010-03-051-6/+16
| | | | * | | Update QmlChanges.txtMichael Brasser2010-03-051-0/+2
| | | | * | | ParentAnimation docs + test.Michael Brasser2010-03-0510-0/+1785
| | | | * | | Remove NumberFormatter and DateTimeFormatter.Michael Brasser2010-03-0514-1642/+0
| | | | * | | RotationAnimation docs + test.Michael Brasser2010-03-044-10/+119
| | | * | | | Don't assume documents are in UTF-8.Bea Lam2010-03-054-3/+69
| | | | |_|/ | | | |/| |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-05211-2184/+2133
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-051-148/+173
| | | | |\ \ \
| | | | | * | | Fix compiler warning on RVCTAaron Kennedy2010-03-051-148/+173
| | | | * | | | Delete uninspiring example.Yann Bodson2010-03-051-46/+0
| | | | * | | | Use new enum syntax for value types.Yann Bodson2010-03-051-11/+11
| | | | |/ / /
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0526-78/+340
| | | | |\ \ \
| | | | | * | | Allow unquoted enum syntax for value typesAaron Kennedy2010-03-0514-8/+89
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-057-17/+167
| | | | | |\ \ \
| | | | | | * | | Add missing NOTIFYs to timer, xmllistmodel, xmlroleJoona Petrell2010-03-057-17/+167
| | | | | * | | | More declarative examples cleanup.Yann Bodson2010-03-053-20/+24
| | | | | * | | | Improve declarative tabs example.Yann Bodson2010-03-052-33/+60
| | | | | |/ / /
| | | | * | | | Expect fail in currentIndex test for now.Martin Jones2010-03-051-26/+20
| | | | |/ / /
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-0525-199/+219
| | | | |\ \ \
| | | | * | | | declarative examples cleanupYann Bodson2010-03-057-40/+12
| | | * | | | | Fix test leaksBea Lam2010-03-052-0/+12
| | | * | | | | Use _data() for some testsBea Lam2010-03-051-377/+158
| | | * | | | | Add mapFromItem() and mapToItem() in QDeclarativeItem.Bea Lam2010-03-044-0/+158
| | | * | | | | Removed unused variableBea Lam2010-03-041-1/+0
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-057-200/+87
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Port QX11GLPixmapData & QX11GLWindowSurface to new QEgl APITom Cooksey2010-03-055-196/+74
| * | | | | | | Make QEgl::createSurface store the surface in the pixmapdata tooTom Cooksey2010-03-051-3/+5
| * | | | | | | Make QEgl::ConfigOptions use QFlagsTom Cooksey2010-03-051-1/+8
|/ / / / / / /
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-057-13/+83
|\ \ \ \ \ \ \
| * | | | | | | Fix for torn off menus that were way too bigThierry Bastian2010-03-051-4/+5
| * | | | | | | Compile fix for Windows Mobile and OpenGLES2ninerider2010-03-051-2/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-0529-195/+407
| |\ \ \ \ \ \ \
| | * | | | | | | Fixa few warnings on mingwThierry Bastian2010-03-052-1/+7
| * | | | | | | | Fixed failure to store certain image formats as jpegaavit2010-03-051-1/+19
| * | | | | | | | Added QImage::bitPlaneCount().aavit2010-03-042-5/+51
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-055-6/+10
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-055-6/+10
| |\ \ \ \ \ \ \ \ |/ / / / / / / / /
| * | | | | | | | Fix spelling in enumeration.Justin McPherson2010-03-054-5/+5