summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * 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
| | |/
| * | 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
|\ \ | |/
| * 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
| |\
| * | XMLHttpRequest testsAaron Kennedy2009-11-091-34/+102
| * | Don't crash on invalid expressionsAaron Kennedy2009-11-093-3/+14
| * | Fix following af454feab24824a7ef2d28794930fb7c227c270fAaron Kennedy2009-11-092-3/+5
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-0922-101/+0
| |\ \
| * \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-091-13/+22
| |\ \ \
| * \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-0917-125/+189
| |\ \ \ \
| * | | | | Do not add public API to QScriptEngineAaron Kennedy2009-11-094-30/+34
| * | | | | Cleanup following reviewAaron Kennedy2009-11-091-1/+1
* | | | | | Prepare for QTBUG-5290 being fixed.Warwick Allison2009-11-091-7/+1
* | | | | | unwarnWarwick Allison2009-11-091-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-0922-101/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-11-094-46/+50
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | remove unneeded constructorsYann Bodson2009-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
| | | | * | | | QGAL: fix leak when restoring anchorsCaio Marcelo de Oliveira Filho2009-11-061-36/+27
| | | | * | | | QGAL: Revamp the edge interpolation codeEduardo M. Fleury2009-11-062-29/+26
| | | | * | | | QGAL: Support for out-of-order parallel anchorsEduardo M. Fleury2009-11-062-10/+45
| | * | | | | | The sizePolicy property of QGraphicsWidget should be of type QSizePolicy of c...Jan-Arve Sæther2009-11-071-1/+1
| | |/ / / / /
| | * | | | | Merge branch 'fixes' of git://gitorious.org/~morphbr/qt/morphbrs-clone into m...Jan-Arve Sæther2009-11-062-0/+7
| | |\ \ \ \ \
| | | * | | | | Make sizePolicy a property of QGraphicsWidget tooArtur Duque de Souza2009-11-062-0/+7
| * | | | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-06215-2038/+4721
| |\ \ \ \ \ \ \
| | * | | | | | | Fix a signed/unsigned comparison warningJoão Abecasis2009-11-061-1/+1
| | |/ / / / / /
| | * | | | | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-06117-1370/+3438
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'feature' into 4.6Jørgen Lind2009-11-0611-4/+59
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix QT_NO_GRAPHICSVIEWJørgen Lind2009-11-061-0/+2
| | | | * | | | | | Fix QT_NO_WHEELEVENTJørgen Lind2009-11-061-0/+2
| | | | * | | | | | Fix QT_NO_WHATSTHISJørgen Lind2009-11-061-0/+2