aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Correctly wait for render thread to exitAaron Kennedy2011-06-221-0/+7
|
* Make QSGCanvas::grabFrameBuffer() more reliableAaron Kennedy2011-06-221-2/+2
|
* Drag items relative to their scene position.Andrew den Exter2011-06-212-6/+11
| | | | | This preserves the absolute position of a dragged item when its parent is changed.
* Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-211-0/+2
|\ | | | | | | into qtquick2
| * Only print debugging when THREAD_DEBUG is enabledAaron Kennedy2011-06-211-0/+2
| |
* | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-2158-852/+1054
|\| | | | | | | into qtquick2
| * Start out with a distance field cache that fits more charactersGunnar Sletta2011-06-201-2/+3
| |
| * Compile when qreal is not a doubleGunnar Sletta2011-06-201-2/+2
| |
| * Compile fix for MSVC.Kim Motoyoshi Kalland2011-06-202-3/+14
| |
| * Removed unnecessary calls to QSGNode::destroy().Kim Motoyoshi Kalland2011-06-203-14/+23
| |
| * Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Gunnar Sletta2011-06-204-3/+608
| |\ | | | | | | | | | into qtquick2
| | * Add "DELETE" support to XMLHttpRequestAaron Kennedy2011-06-201-3/+6
| | |
| | * Add QDeclarativeChangeSet.Andrew den Exter2011-06-203-0/+602
| | | | | | | | | | | | | | | | | | Takes a sequence of model changes and reorders and compresses them so that like changes are grouped together and are ordered from start to end. The order is Removed, Inserted, Moved then Changed.
| * | Merge branch 'master' into qtquick2Gunnar Sletta2011-06-201-1/+36
| |\ \
| | * | Implement caching of the distance fields...Gunnar Sletta2011-06-201-1/+36
| | | | | | | | | | | | | | | | Change-Id: I823341b9b53e885dcd004e17e319cf033dc21c45
| * | | Merge branch 'master' into qtquick2Gunnar Sletta2011-06-1551-813/+359
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp Change-Id: Id2267925c4f77b41f63bbbf555b816ca1f55a0ec
| | * | Speed up distance field generation by another 20% or so.Gunnar Sletta2011-06-151-5/+3
| | | |
| | * | Speed up distance field generation by 5-20%Gunnar Sletta2011-06-151-1/+4
| | | |
| | * | Use linked list instead of QList for node children.Kim Motoyoshi Kalland2011-06-1010-67/+134
| | | |
| | * | Removed matrix stacks from QSGRenderer.Kim Motoyoshi Kalland2011-06-1011-605/+36
| | | |
| | * | Make min-heap member of QMLRenderer instead of stack variable.Kim Motoyoshi Kalland2011-06-102-46/+60
| | | | | | | | | | | | | | | | The heap is used to sort non-overlapping children.
| | * | Replaced QStack with QDataBuffer in the node updater.Kim Motoyoshi Kalland2011-06-102-26/+25
| | | |
| | * | Cut off blocked sub-trees one node earlier.Kim Motoyoshi Kalland2011-06-102-9/+8
| | | | | | | | | | | | | | | | Do not even enter the blocked node.
| | * | Removed QSGNodeVisitor inheritance from QSGNodeUpdater.Kim Motoyoshi Kalland2011-06-102-14/+54
| | | | | | | | | | | | | | | | This reduces the number of virtual function calls.
| | * | Added QSGNode::removeAllChildNodes().Kim Motoyoshi Kalland2011-06-103-9/+20
| | | |
| | * | Keep track of the number of geometry nodes in a sub-graph.Kim Motoyoshi Kalland2011-06-102-4/+18
| | | | | | | | | | | | | | | | | | | | If there are no geometry nodes in a sub-graph, there's no need to update it.
| | * | Doc: Cleaned up the scene graph documentation a little.David Boddie2011-06-0935-38/+8
| | | |
| * | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Gunnar Sletta2011-06-151-1/+0
| |\ \ \ | | | |/ | | |/| | | | | into qtquick2
| * | | Renamed QMLRenderer -> QSGDefaultRendererGunnar Sletta2011-06-154-15/+10
| | | | | | | | | | | | | | | | Change-Id: Ib1f00d45cecd3b438148adce2f7cf247030b2dfb
* | | | Rewrite last rewriteAlan Alpert2011-06-2118-672/+459
| | | | | | | | | | | | | | | | | | | | Also rewrite to have all particle state shared, not just common elements.
* | | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-161-1/+0
|\ \ \ \ | | |/ / | |/| | | | | | into qtquick2
| * | | Remove annoying warningGunnar Sletta2011-06-151-1/+0
| |/ /
* | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-153-0/+17
|\| | | | | | | | | | | into qtquick2
| * | Print out a warning when attributes are enabledGunnar Sletta2011-06-151-0/+15
| | |
| * | Disable attributes from shader effectsGunnar Sletta2011-06-151-0/+1
| | | | | | | | | | | | Reviewed-by: Samuel
| * | Initialize member variableGunnar Sletta2011-06-141-0/+1
| | |
* | | Rewrite particle system to cope with changing particle countsAlan Alpert2011-06-1517-388/+547
|/ / | | | | | | | | | | | | And might do it again... Caught up in this massive change were the following smaller ones: -Some custom particle examples -delegate property on ItemParticle and an example with it
* | Safer cleanup in model/item particleAlan Alpert2011-06-142-12/+14
| |
* | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-1410-51/+120
|\ \ | | | | | | | | | into qtquick2
| * | QDeclarativeDebug: Don't hang if started with ',block' argumentKai Koehne2011-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | Fixes regression introduced in a59261454071 Reviewed-by: Christiaan Janssen (cherry picked from commit e3b5de8651586cf5484fd8ab217cddf17f0fe01e)
| * | QDeclarativeDebug: Fix QJSDebugService if launched with ',block'Kai Koehne2011-06-103-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | If the debugger is launched in blocking mode the service will be enabled from the start. Reviewed-by: Thorbjorn Lindeijer (cherry picked from commit c038e3505309bb954123493cb5f96c73e114f3d0)
| * | Merge branch 'master' into qtquick2Gunnar Sletta2011-06-103-37/+24
| |\|
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-stagingGunnar Sletta2011-06-092-36/+23
| | |\
| | | * Notify when the TextInput cursorRectangle property changes within pre-editAndrew den Exter2011-06-092-36/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Anything that updates the horizontal scroll is also likely to change the position of the cursor rectangle and the micro focus. So group these actions together and ensure they're done before emitting cursorPositionChanged() so positionToRectangle() returns a valid value from that handler. Change-Id: I5fadc58efb148a8dabe88a94381c86cd64dba3bd Task-number: QTBUG-19089 Reviewed-by: Martin Jones (cherry picked from commit a0b2fc44ff8752193cacde52276b1822741f5374)
| | * | Use the Qt 4 function for updatesEnabled()Gunnar Sletta2011-06-091-1/+1
| | |/ | | | | | | | | | Change-Id: I78bf3b8acff54b83493aebc480e7f9b4f32c1c70
| * | Disable vsync animations by defaultGunnar Sletta2011-06-103-13/+64
| | | | | | | | | | | | Change-Id: Ia614915ddb96f5c51e9883885479f1269ab361ed
| * | Create property cache in case of Component{} rootAaron Kennedy2011-06-101-0/+6
| | | | | | | | | | | | | | | | | | Change-Id: I36f969d09d8ce5e0b68b657b514586990e88ebe4 Task-number: QTBUG-19354 (cherry picked from commit af1350249ea9de68e1c4b72ed1179948aa28ca19)
* | | Add delegate property to ItemParticleAlan Alpert2011-06-105-28/+83
|/ / | | | | | | Also add burst(n,x,y) to ParticleEmitter, and a demo that uses both.
* | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-0914-9/+956
|\ \ | | | | | | | | | into qtquick2
| * | Add a DragTarget element.Andrew den Exter2011-06-0913-8/+943
| | | | | | | | | | | | | | | | | | | | | Provides an area that can be used to handle events when other items are dragged over it. Task-number: QMLNG-32