summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* make twitter not depend on flickr exampleYann Bodson2009-10-3018-20/+172
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-10-30394-4592/+8666
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-30256-2112/+24210
| |\
| * | fix macrosWarwick Allison2009-10-299-7/+27
| * | auto-detect declarativeWarwick Allison2009-10-291-4/+17
| * | fix headersWarwick Allison2009-10-2969-51/+2511
| * | fix headersWarwick Allison2009-10-29286-4537/+4617
| * | fix headersWarwick Allison2009-10-2942-56/+1598
| * | fix merge duplicationWarwick Allison2009-10-291-1/+0
* | | cleanup dial exampleYann Bodson2009-10-309-50/+15
* | | cleanupYann Bodson2009-10-303-2/+3
* | | small fixes to parallax exampleYann Bodson2009-10-302-27/+12
* | | fix twitter exampleYann Bodson2009-10-302-3/+3
* | | fix parallax exampleYann Bodson2009-10-302-7/+5
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-10-3028-61/+86
|\ \
| * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-10-3012-12/+15
| |\ \
| * \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-10-3021-128/+103
| |\ \ \
| * | | | Doc.Michael Brasser2009-10-3023-39/+39
| * | | | qdoc3: display 'read-only' in QML docs for read only properties.Michael Brasser2009-10-304-6/+33
| * | | | qdoc3: Fixed a linking error for qml properties.Martin Smith2009-10-292-16/+14
* | | | | change cities in clock exampleYann Bodson2009-10-302-5/+5
| |_|/ / |/| | |
* | | | cleanupYann Bodson2009-10-3012-12/+15
| |/ / |/| |
* | | cleanupYann Bodson2009-10-3016-41/+12
* | | improve clock exampleYann Bodson2009-10-307-37/+41
|/ /
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-293-7/+47
|\ \
| * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-2996-700/+2457
| |\ \
| * | | Add local highscores to SameGameAlan Alpert2009-10-293-7/+47
* | | | Add attached properties typeinfoAaron Kennedy2009-10-292-0/+2
* | | | Testcase for warnings at shutdownAaron Kennedy2009-10-292-0/+30
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-2920-501/+297
|\ \ \
| * | | 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-2912-466/+250
| |\ \ \
| | * \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-29184-8441/+21638
| | |\ \ \ | | | |/ /
| | | * | Remove duplicated docAlan Alpert2009-10-291-78/+0
| | | * | Merge QmlComponentJS into QmlComponentAlan Alpert2009-10-299-319/+69
| | * | | DocAlan Alpert2009-10-291-2/+2
| | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-28122-358/+817
| | |\ \ \
| | * | | | Fill out QML global object documentationAlan Alpert2009-10-284-118/+180
| | * | | | 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-2991-807/+21401
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Avoid unnecessary viewport scrolling when bringing currentItem into view.Martin Jones2009-10-292-10/+20
| | |_|_|/ | |/| | |
* | | | | 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-2984-596/+2229
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Fix warning in qvariant.h header + make sure QVariant in QVariant works as ex...Olivier Goffart2009-10-282-27/+257
| * | | | Fixed bug in QTableView spans.Gabriel de Dietrich2009-10-283-2/+85
| * | | | Fixed missing repaints on QTreeView when moving the mouseThierry Bastian2009-10-281-2/+6
| * | | | Extand test of qBinaryFindOlivier Goffart2009-10-281-1/+16
| * | | | Use qLowerBound in qBinaryFindPascal Létourneau2009-10-281-32/+10