summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits) Fix compilation with Sun CC: no semi-colon after Q_ENUM. Remove the "Insert unicode control character" menu entry on X11. adds a timeout option to QThreadPool::waitForDone(); Remove leading whitespace from Qt header macros. Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch. Add QDateTime members that operate on 64-bit milliseconds. Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now ...
| * Fix compilation with Sun CC: no semi-colon after Q_ENUM.Thiago Macieira2010-03-311-1/+1
| | | | | | | | | | | | | | Error was: "graphicsitems/qdeclarativepathview_p.h", line 80: Error: "}" expected instead of ";" Reviewed-by: Olivier Goffart
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-315-6/+19
|\ \
| * | Improve flipable example.Yann Bodson2010-03-311-1/+1
| | |
| * | VisibleArea is not a creatable type.Michael Brasser2010-03-311-1/+1
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-311-0/+1
| |\ \
| | * | Update mouseX(Y) when clicking on a mouse areaLeonardo Sobral Cunha2010-03-311-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | This fixes the original commit, 56aa9370dbafa8ee4, for QTBUG-9383. We need to emit a positionChanged signal to update the mouseX(Y) for the mouse area. Reviewed-by: Martin Jones
| * | docWarwick Allison2010-03-311-0/+4
| |/
| * Optimization: Use internal QGraphicsItemPrivate::setItemParentHelper()Aaron Kennedy2010-03-301-4/+12
| | | | | | | | | | This brings the "data" property inline with the "children" property. Improves the declarative/creation/itemtree_qml test by 13%.
* | Fix snapping in listview.Martin Jones2010-03-312-15/+35
|/
* Fixes PathView compile warningsLeonardo Sobral Cunha2010-03-302-2/+2
|
* Finished file rename of qdeclarative easefollow to smoothedanimationLeonardo Sobral Cunha2010-03-303-3/+2
|
* Change and rename qml EaseFollow to SmoothedAnimationLeonardo Sobral Cunha2010-03-302-38/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeSmoothedAnimation inherits from QDeclarativeNumberAnimation, as a consequence SmoothedAnimation can be used inside Behaviors and as PropertySourceValues, like any other animation. The old EaseFollow properties changed to comply with the other declarative animations ('source' changed to 'to'), so now 'to' changes are not automatically 'followed' anymore. You can achieve the following behavior by putting a SmoothedAnimation inside a Behavior of a property that is bound to another, as the following example: If you want to follow an hypothetical rect1, you should do now: Rectangle { color: "green" width: 60; height: 60; x: rect1.x - 5; y: rect1.y - 5; Behavior on x { SmoothedAnimation { velocity: 200 } } Behavior on y { SmoothedAnimation { velocity: 200 } } } SmoothedAnimation also supports animating multiple target(s)/property(ies) in the transition case. When a QDeclarativeSmoothedAnimation is restarted, it will match the QDeclarativeProperty which were being animated and transfer the corresponding track velocity to the new starting animations. QSmoothedAnimation is an uncontrolled animation, duration == -1. The duration is set as -1 to avoid consecutive animation state changes stop()/start(). This is particularly useful when using QSmoothAnimation to 'follow' another property, which is also being animated (change the 'to' property every tick). Reviewed-by: Michael Brasser
* Fix parenting after 6f88388db4e8e202780d789e66664ff824691948.Michael Brasser2010-03-308-35/+31
|
* Don't emit onPositionChanged before onPressedMartin Jones2010-03-301-1/+0
| | | | Task-number: QTBUG-9383
* Correctly parent repeater items.Michael Brasser2010-03-301-5/+5
|
* Make sure cursor delegate is parented.Michael Brasser2010-03-292-0/+4
| | | | setParentItem no longer sets QObject parent.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-291-4/+0
|\
| * QDeclarativeItem::setParentItem should not modify the QObject parentAaron Kennedy2010-03-291-4/+0
| | | | | | | | QTBUG-5768
* | Ensure currentIndex is updated when PathView items are removed/movedMartin Jones2010-03-292-8/+37
|/
* Relayout items when Flow size changes.Martin Jones2010-03-291-0/+3
| | | | | | Also add Flow tests. Task-number: QTBUG-9421
* tyopWarwick Allison2010-03-281-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-263-57/+280
|\
| * Added highlight ranges/modes to PathViewMartin Jones2010-03-263-57/+280
| | | | | | | | Task-number: QT-319
* | I've been told this fixes compilation on windows.Alan Alpert2010-03-261-1/+1
| |
* | Doc AugmentationAlan Alpert2010-03-261-1/+3
|/ | | | Task-number: QTBUG-9396
* Test and fix order of transform application.Warwick Allison2010-03-263-37/+9
| | | | Remove Translate.z since Qt cannot sensibly support it yet.
* Fix namespace.Warwick Allison2010-03-261-1/+3
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-261-4/+0
|\
| * QDeclarativeItem don't need to emit childrenChanged anymore.Alexis Menard2010-03-261-4/+0
| | | | | | | | | | | | It's done by QGraphicsItemPrivate::addChild and removeChild. Reviewed-by:akennedy
* | sourceWidth/sourceHeight -> sourceSizeWarwick Allison2010-03-264-47/+24
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-265-18/+19
|\
| * Do not call parent implementation if we accept the keyPressEvent in GridView ↵Yann Bodson2010-03-262-6/+6
| | | | | | | | and ListView delegates.
| * Remove Q prefix from the validators.Michael Brasser2010-03-262-11/+12
| |
| * Really fix qMin() parameter types.Martin Jones2010-03-261-1/+1
| |
* | Control of image rendered size (esp. SVG).Warwick Allison2010-03-2610-18/+393
|/ | | | | | | Add Translate transform. Image::sourceWidth and Image::sourceHeight read/write properties. Task-number: QTBUG-8984
* Remove some Script {} docsMartin Jones2010-03-251-9/+7
|
* Ensure both qMin() parameters are the same type.Martin Jones2010-03-251-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-253-11/+11
|\ | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| * Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2512-101/+139
| |\ | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| * | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-241-1/+1
| | |
| * | doc: Fixed function signatures in qdoc comments.Martin Smith2010-03-241-9/+9
| | |
| * | Fix compilation with WINSCW: #include doesn't find files in the same dirThiago Macieira2010-03-201-3/+3
| | |
* | | Optimize QML "parent" property accessAaron Kennedy2010-03-252-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 Jones2010-03-253-302/+389
| | | | | | | | | | | | | | | | | | views. Task-number: QT-319
* | | Auto-test fix.Alexis Menard2010-03-251-2/+2
| | | | | | | | | | | | | | | | | | Also fix a connect in QDeclarativeItem. Reviewed-by:TrustMe
* | | Build Fix and port to new width and height propertiesAlexis Menard2010-03-254-6/+6
| | | | | | | | | | | | Reviewed-by:Martin Jones
* | | Port Flickable and Flipable to support QGraphicsObject.Alexis Menard2010-03-254-20/+21
| | | | | | | | | | | | | | | | | | Replacing QDeclarativeItem* members by QGraphicsObject*. Build fix too. Reviewed-by:akennedy
* | | Fix the build due to new properties in QGraphicsObject.Alexis Menard2010-03-252-6/+5
| | | | | | | | | | | | Reviewed-by:Martin Jones
* | | Remove the children property from QDeclarativeItem.Alexis Menard2010-03-253-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