Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix parenting after 6f88388db4e8e202780d789e66664ff824691948. | Michael Brasser | 2010-03-30 | 8 | -35/+31 |
| | |||||
* | Don't emit onPositionChanged before onPressed | Martin Jones | 2010-03-30 | 1 | -1/+0 |
| | | | | Task-number: QTBUG-9383 | ||||
* | Correctly parent repeater items. | Michael Brasser | 2010-03-30 | 1 | -5/+5 |
| | |||||
* | Make sure cursor delegate is parented. | Michael Brasser | 2010-03-29 | 2 | -0/+4 |
| | | | | setParentItem no longer sets QObject parent. | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 1 | -4/+0 |
|\ | |||||
| * | QDeclarativeItem::setParentItem should not modify the QObject parent | Aaron Kennedy | 2010-03-29 | 1 | -4/+0 |
| | | | | | | | | QTBUG-5768 | ||||
* | | Ensure currentIndex is updated when PathView items are removed/moved | Martin Jones | 2010-03-29 | 2 | -8/+37 |
|/ | |||||
* | Relayout items when Flow size changes. | Martin Jones | 2010-03-29 | 1 | -0/+3 |
| | | | | | | Also add Flow tests. Task-number: QTBUG-9421 | ||||
* | tyop | Warwick Allison | 2010-03-28 | 1 | -1/+1 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-03-26 | 3 | -57/+280 |
|\ | |||||
| * | Added highlight ranges/modes to PathView | Martin Jones | 2010-03-26 | 3 | -57/+280 |
| | | | | | | | | Task-number: QT-319 | ||||
* | | I've been told this fixes compilation on windows. | Alan Alpert | 2010-03-26 | 1 | -1/+1 |
| | | |||||
* | | Doc Augmentation | Alan Alpert | 2010-03-26 | 1 | -1/+3 |
|/ | | | | Task-number: QTBUG-9396 | ||||
* | Test and fix order of transform application. | Warwick Allison | 2010-03-26 | 3 | -37/+9 |
| | | | | Remove Translate.z since Qt cannot sensibly support it yet. | ||||
* | Fix namespace. | Warwick Allison | 2010-03-26 | 1 | -1/+3 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-26 | 1 | -4/+0 |
|\ | |||||
| * | QDeclarativeItem don't need to emit childrenChanged anymore. | Alexis Menard | 2010-03-26 | 1 | -4/+0 |
| | | | | | | | | | | | | It's done by QGraphicsItemPrivate::addChild and removeChild. Reviewed-by:akennedy | ||||
* | | sourceWidth/sourceHeight -> sourceSize | Warwick Allison | 2010-03-26 | 4 | -47/+24 |
|/ | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-26 | 5 | -18/+19 |
|\ | |||||
| * | Do not call parent implementation if we accept the keyPressEvent in GridView ↵ | Yann Bodson | 2010-03-26 | 2 | -6/+6 |
| | | | | | | | | and ListView delegates. | ||||
| * | Remove Q prefix from the validators. | Michael Brasser | 2010-03-26 | 2 | -11/+12 |
| | | |||||
| * | Really fix qMin() parameter types. | Martin Jones | 2010-03-26 | 1 | -1/+1 |
| | | |||||
* | | Control of image rendered size (esp. SVG). | Warwick Allison | 2010-03-26 | 10 | -18/+393 |
|/ | | | | | | | Add Translate transform. Image::sourceWidth and Image::sourceHeight read/write properties. Task-number: QTBUG-8984 | ||||
* | Remove some Script {} docs | Martin Jones | 2010-03-25 | 1 | -9/+7 |
| | |||||
* | Ensure both qMin() parameters are the same type. | Martin Jones | 2010-03-25 | 1 | -1/+1 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Martin Jones | 2010-03-25 | 3 | -11/+11 |
|\ | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp | ||||
| * | Merge remote branch 'main/4.7' into 4.7 | Morten Johan Sørvig | 2010-03-25 | 12 | -101/+139 |
| |\ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp | ||||
| * | | doc: Fixed all the remaining qdoc errors. For now. | Martin Smith | 2010-03-24 | 1 | -1/+1 |
| | | | |||||
| * | | doc: Fixed function signatures in qdoc comments. | Martin Smith | 2010-03-24 | 1 | -9/+9 |
| | | | |||||
| * | | Fix compilation with WINSCW: #include doesn't find files in the same dir | Thiago Macieira | 2010-03-20 | 1 | -3/+3 |
| | | | |||||
* | | | Optimize QML "parent" property access | Aaron Kennedy | 2010-03-25 | 2 | -1/+16 |
| | | | | | | | | | | | | | | | For properties that are as important as "parent", QML cannot afford the overhead of a signal/slot connection. | ||||
* | | | Begin dragging PathView up to the level (quality and functionality) of other ↵ | Martin Jones | 2010-03-25 | 3 | -302/+389 |
| | | | | | | | | | | | | | | | | | | views. Task-number: QT-319 | ||||
* | | | Auto-test fix. | Alexis Menard | 2010-03-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Also fix a connect in QDeclarativeItem. Reviewed-by:TrustMe | ||||
* | | | Build Fix and port to new width and height properties | Alexis Menard | 2010-03-25 | 4 | -6/+6 |
| | | | | | | | | | | | | Reviewed-by:Martin Jones | ||||
* | | | Port Flickable and Flipable to support QGraphicsObject. | Alexis Menard | 2010-03-25 | 4 | -20/+21 |
| | | | | | | | | | | | | | | | | | | Replacing QDeclarativeItem* members by QGraphicsObject*. Build fix too. Reviewed-by:akennedy | ||||
* | | | Fix the build due to new properties in QGraphicsObject. | Alexis Menard | 2010-03-25 | 2 | -6/+5 |
| | | | | | | | | | | | | Reviewed-by:Martin Jones | ||||
* | | | Remove the children property from QDeclarativeItem. | Alexis Menard | 2010-03-25 | 3 | -113/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit remove the children property from QDeclarativeItem because it's now in QGraphicsObject. This commit also get rid of width and height properties to use the one in QGraphicsObject. Task-number:QT-2757 Reviewed-by:akennedy | ||||
* | | | Pen is not a creatable type. | Michael Brasser | 2010-03-25 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Doc fix. | Michael Brasser | 2010-03-25 | 3 | -3/+3 |
| | | |||||
* | | Ensure currentIndex is updated when items inserted before currentIndex | Martin Jones | 2010-03-25 | 2 | -4/+30 |
| | | | | | | | | | | | | Was occurring when items inserted but no items had been created yet. Task-number: QTBUG-9313 | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-24 | 2 | -5/+10 |
|\ \ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-24 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix abort in flipable | Leonardo Sobral Cunha | 2010-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flipable was calling updateSceneTransformFromParent, but this can only called when the the parent's scene transform is guaranteed to be updated, which is not the case in flipable. Task-number: QTBUG-8474 Reviewed-by: bnilsen | ||||
| * | | | Revert 95aa8c8fc76e2309a629b05994a2677b0887140b. | Warwick Allison | 2010-03-24 | 1 | -5/+0 |
| |/ / | |||||
| * | | Make compile. | Michael Brasser | 2010-03-24 | 1 | -1/+1 |
| | | | |||||
| * | | Output all Loader errors. | Michael Brasser | 2010-03-24 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | Previously we were not outputting those that occurred on component->create(). | ||||
| * | | Fix Loader leak when loading a non-QGraphicsObject object. | Michael Brasser | 2010-03-24 | 1 | -1/+5 |
| | | | |||||
| * | | Use setParent_NoEvent in Loader and benchmark Loader performance. | Michael Brasser | 2010-03-24 | 1 | -2/+3 |
| | | | |||||
| * | | Origin safety testing for imported resources. | Warwick Allison | 2010-03-24 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | Extends upon 95aa8c8fc76e2309a629b05994a2677b0887140b. Still under discussion. | ||||
* | | | Fix flicking views at boundary with StricthighlighRange | Martin Jones | 2010-03-24 | 2 | -37/+49 |
|/ / | | | | | | | Task-number: QTBUG-9256 |