summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QmlDom testsAaron Kennedy2009-11-114-84/+57
|
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-11-1110-65/+81
|\ | | | | | | into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-119-73/+165
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-11-111-4/+14
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-112-2/+1
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | 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 ↵Yann Bodson2009-11-101-13/+102
| | |\ \ | | | |/ | | | | | | | | into kinetic-declarativeui
| | * | SpringFollow autotestYann Bodson2009-11-102-2/+1
| | | |
| * | | Revert 4bf7f90a27377f439e86d6175e5e3cdebd131be0 and implement differently.Warwick Allison2009-11-102-5/+18
| |/ / | | | | | | | | | | | | Setting painter clip can reduce performance in some cases, so items must access system clip.
* | | Fix debugger crash on exitBea Lam2009-11-111-4/+5
| | |
* | | Change stateChanged(State) signatures to have (QmlDebugWatch::State)Bea Lam2009-11-111-2/+2
| | | | | | | | | | | | and (QmlDebugQuery::State) parameters.
* | | Change watch state to Dead instead of Active on removal.Bea Lam2009-11-111-5/+4
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-1014-50/+90
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * ignore (expect) message in testWarwick Allison2009-11-101-1/+1
| |
| * Return qmlInfo(obj) << syntax.Warwick Allison2009-11-1013-49/+89
| | | | | | | | Fixes QTBUG-5480
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-1015-81/+173
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-11-10347-4417/+8689
| |\ | | | | | | | | | into kinetic-declarativeui
| | * 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 ↵Warwick Allison2009-11-1010-106/+191
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-106-102/+131
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | 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
| | | | | | | | | | | | | | | | | | | | with zoomFactor.
| | * | | Distinguish between tranform smoothness (from Item) and smoothnessWarwick Allison2009-11-103-3/+34
| | | | | | | | | | | | | | | | | | | | of the painted chunks (often want the latter not the former).
| | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-1012-80/+165
| | |\ \ \ | | | |/ / | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | 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 ↵Aaron Kennedy2009-11-105-98/+98
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-11-103-98/+84
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Clarify the role of positioner transitionsAlan Alpert2009-11-101-89/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are only for the positioner's position changes, other changes are under the designers control and the designer should animate them. Task-number: QT-2239
| | * | | | Positioners now watch for sibling order changesAlan Alpert2009-11-103-9/+75
| | | |_|/ | | |/| | | | | | | | | | | | Task-number: QT-2241
| * | | | 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 ↵Aaron Kennedy2009-11-09320-4164/+8239
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-0922-101/+0
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | 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 ↵Warwick Allison2009-11-09318-4149/+8232
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h
| | * \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using operator[] can cause a deep copy if the container is not const. Some of the containers were const, but I changed all of them to use at() since its more Qt-style.
| | | * | Merge branch 'cmarcelo-vertexsimplification' into 4.6Jan-Arve Sæther2009-11-072-171/+559
| | | |\ \
| | | | * \ Merge branch 'anchor-vertex-simplification' of ↵Jan-Arve Sæther2009-11-072-171/+559
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/~cmarcelo/qt/cmarcelos-clone into cmarcelo-vertexsimplification
| | | | | * | QGAL: avoid passing Orientation for interpolation functionsCaio Marcelo de Oliveira Filho2009-11-062-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all of the interpolation functions needed the orientation information, and the one that needs can look at the orientation of the anchor in the parameter. This simplified a little bit the function calls. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | | | | * | QGAL: vertex simplificationCaio Marcelo de Oliveira Filho2009-11-062-73/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some vertices are connected by anchors with size 0, which means that in practice, they represent the same point when positioning items, i.e. their distance value is the same. In those cases, we can merge the two anchors in one, that's what vertex simplification do. The algorithm is walking in the graph, merging vertices in pairs (this could be enhanced to allow groups with arbitrary number of children vertices) The vertex simplification stage happens before the anchor simplification, so it'll make less passes. Also, in some situations of redudant anchors it will allow more anchors to be simplified. This commit creates a new type of AnchorVertex, add the algorithm for vertex simplification and restoration, make sure that distribution also works with simplified vertices. Consequences: - the assert after creating a sequence might not be true anymore, it was a structural assumption that vertex simplification may destroy; - we assumed that a center anchor could appear only in the beginning or end of the candidates, because the "center vertex" always would have 3 adjacents. A mix of parallel+center and vertex simplification break that assumption. The commit deal with those consequences. We still have one limitation: vertex simplification needs to restore the graph in every invalidation (which might be caused by some child's updateGeometyry()), since a change in the sizeHint might cause a new anchor to have size 0 or a 0-sized anchor to have a different size. In the future we can track the 0 sized anchors and only restore/re-simplify when the set changes. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | | | | * | QGAL: allow parallel anchors simplify center anchorsCaio Marcelo de Oliveira Filho2009-11-062-16/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit make possible to parallelize anchors that are center anchors, i.e. that have extra constraints (stored in itemCenterConstraints). This is trivial to support since the parallel anchor will have the same size as its children, so it can just "take the place" of its children in the constraints. Restore function was added as well. To manipulate internal structures, relevant static functions were promoted to methods. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
generated by cgit v0.12 at 2024-11-30 07:08:32 (GMT)