summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-028-58/+63
|\
| * Mark Action class as to be exportedKai Koehne2009-11-021-1/+1
| * Doc: Fixed typoKai Koehne2009-11-021-1/+1
| * NOTIFY ListModel::countWarwick Allison2009-11-022-2/+7
| * renaming QmlGraphicsRect -> QmlGraphicsRectangleYann Bodson2009-11-024-54/+54
* | Qt object testAaron Kennedy2009-11-021-10/+23
* | DocAaron Kennedy2009-11-021-2/+0
|/
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-024-70/+246
|\
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-11-023-27/+77
| |\
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-11-02437-13074/+32271
| | |\
| | * | Fix to send correct data for property value changes.Bea Lam2009-11-021-1/+1
| | * | Make QmlBoundSignal children look like properties (instead of children)Bea Lam2009-11-023-25/+75
| | * | Minor changesBea Lam2009-10-291-1/+1
| * | | Add images to QML easing curve documentationYann Bodson2009-11-021-43/+169
| | |/ | |/|
* | | QmlContext testsAaron Kennedy2009-11-026-4/+51
|/ /
* | added missing include for template instantiation (in qDeleteAll)mae2009-10-301-1/+1
* | Missing fileAaron Kennedy2009-10-301-0/+91
* | Rename fx -> graphicsitemsAaron Kennedy2009-10-3079-85/+85
* | CleanupAaron Kennedy2009-10-3038-125/+18
* | compileWarwick Allison2009-10-302-3/+3
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-30291-4556/+4733
|\ \
| * | fix headersWarwick Allison2009-10-305-80/+80
| * | fix macrosWarwick Allison2009-10-301-2/+2
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-30159-1617/+22141
| |\ \
| | * | Doc.Michael Brasser2009-10-3023-39/+39
| * | | fix macrosWarwick Allison2009-10-299-7/+27
| * | | fix headersWarwick Allison2009-10-294-4/+4
| * | | fix headersWarwick Allison2009-10-29286-4537/+4617
| * | | fix headersWarwick Allison2009-10-292-0/+80
| * | | fix merge duplicationWarwick Allison2009-10-291-1/+0
* | | | Make private headers _pAaron Kennedy2009-10-30189-4555/+4556
* | | | Rename qfx files to qmlgraphics filesAaron Kennedy2009-10-3088-347/+347
* | | | Rename QFx classes to QmlGraphicsAaron Kennedy2009-10-30104-3726/+3726
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-2916-480/+126
|\ \ \
| * | | Save a little more memory.Martin Jones2009-10-293-13/+15
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-299-445/+80
| |\ \ \
| | * \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-2988-2551/+21248
| | |\ \ \
| | | * | | Remove duplicated docAlan Alpert2009-10-291-78/+0
| | | * | | Merge QmlComponentJS into QmlComponentAlan Alpert2009-10-298-318/+68
| | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-2830-115/+352
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Fill out QML global object documentationAlan Alpert2009-10-282-116/+3
| | * | | | Minor cleanup of global objectAlan Alpert2009-10-282-11/+9
| * | | | | Store filename as a QUrl rather than convert to QString.Martin Jones2009-10-293-12/+12
| * | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-2965-599/+21035
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Avoid unnecessary viewport scrolling when bringing currentItem into view.Martin Jones2009-10-291-10/+19
| | |_|_|/ | |/| | |
* | | | | Merge branch '4.6' of ../qt-widget-team into kinetic-declarativeuiAaron Kennedy2009-10-291-2/+2
|\ \ \ \ \
| * | | | | Compile with -no-qt3supportAaron Kennedy2009-10-291-2/+2
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into kinet...Aaron Kennedy2009-10-2959-499/+941
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Fix warning in qvariant.h header + make sure QVariant in QVariant works as ex...Olivier Goffart2009-10-281-27/+12
| * | | | Fixed bug in QTableView spans.Gabriel de Dietrich2009-10-282-2/+47