summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* QmlDom testsAaron Kennedy2009-11-114-84/+57
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-11-1110-65/+81
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-119-73/+165
| |\
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2009-11-111-4/+14
| | |\
| | | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-112-2/+1
| | | |\
| | | * | Make consistent timer mode more consistentAaron Kennedy2009-11-111-4/+14
| | * | | AnimatedImage cleanup and tests.Michael Brasser2009-11-115-54/+48
| | | |/ | | |/|
| | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-11-101-13/+102
| | |\ \ | | | |/
| | * | SpringFollow autotestYann Bodson2009-11-102-2/+1
| * | | Revert 4bf7f90a27377f439e86d6175e5e3cdebd131be0 and implement differently.Warwick Allison2009-11-102-5/+18
| |/ /
* | | Fix debugger crash on exitBea Lam2009-11-111-4/+5
* | | Change stateChanged(State) signatures to have (QmlDebugWatch::State)Bea Lam2009-11-111-2/+2
* | | Change watch state to Dead instead of Active on removal.Bea Lam2009-11-111-5/+4
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-1014-50/+90
|\ \ | |/
| * ignore (expect) message in testWarwick Allison2009-11-101-1/+1
| * Return qmlInfo(obj) << syntax.Warwick Allison2009-11-1013-49/+89
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-1015-81/+173
|\ \ | |/
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-11-10347-4417/+8689
| |\
| | * Fix docs missed after properties -> matchProperties rename.Michael Brasser2009-11-101-3/+3
| | * Fix QmlTimer to be in line with animation API changesAlan Alpert2009-11-101-1/+1
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-1010-106/+191
| | |\
| | | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-11-106-102/+131
| | | |\
| | | * | More highlight testing.Martin Jones2009-11-104-4/+60
| | * | | Remove WebView::pagewidth and tidy up - it's not needed and interferedWarwick Allison2009-11-103-52/+54
| | * | | Distinguish between tranform smoothness (from Item) and smoothnessWarwick Allison2009-11-103-3/+34
| | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-1012-80/+165
| | |\ \ \ | | | |/ /
| | * | | Prepare for QTBUG-5290 being fixed.Warwick Allison2009-11-091-7/+1
| | * | | unwarnWarwick Allison2009-11-091-1/+1
| * | | | Minor improvements, additional pointer checks.Bea Lam2009-11-102-10/+17
| * | | | Fix crash bug where socket is 0.Bea Lam2009-11-101-0/+2
* | | | | XMLHttpRequest testsAaron Kennedy2009-11-101-13/+102
| |_|_|/ |/| | |
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-105-98/+98
|\ \ \ \
| * \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-11-103-98/+84
| |\ \ \ \
| | * | | | Clarify the role of positioner transitionsAlan Alpert2009-11-101-89/+9
| | * | | | Positioners now watch for sibling order changesAlan Alpert2009-11-103-9/+75
| | | |_|/ | | |/| |
| * | | | Test (and fix) animation actions.Michael Brasser2009-11-102-0/+14
| |/ / /
* | | | More XMLHttpRequest testsAaron Kennedy2009-11-101-4/+33
|/ / /
* | | Fix after animation API changes.Michael Brasser2009-11-093-9/+9
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-09320-4164/+8239
|\ \ \ | | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-0922-101/+0
| |\ \ | | |/
| * | Remove no-op diff to 4.6.Warwick Allison2009-11-091-1/+0
| * | Revert unneeded differences to Qt 4.6.Warwick Allison2009-11-092-14/+7
| * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-09318-4149/+8232
| |\ \
| | * \ Merge file://t:/dev/qt-46-wt into widgetteamJan-Arve Sæther2009-11-084-185/+580
| | |\ \
| | | * | Use at() instead of operator[] for vectors and lists.Jan-Arve Sæther2009-11-071-24/+24
| | | * | Merge branch 'cmarcelo-vertexsimplification' into 4.6Jan-Arve Sæther2009-11-072-171/+559
| | | |\ \
| | | | * \ Merge branch 'anchor-vertex-simplification' of git://gitorious.org/~cmarcelo/...Jan-Arve Sæther2009-11-072-171/+559
| | | | |\ \
| | | | | * | QGAL: avoid passing Orientation for interpolation functionsCaio Marcelo de Oliveira Filho2009-11-062-23/+16
| | | | | * | QGAL: vertex simplificationCaio Marcelo de Oliveira Filho2009-11-062-73/+379
| | | | | * | QGAL: allow parallel anchors simplify center anchorsCaio Marcelo de Oliveira Filho2009-11-062-16/+82