Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/4.7' into symbian47 | Thomas Zander | 2010-03-31 | 6 | -327/+0 |
|\ | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebCore/WebCore.pro src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def | ||||
| * | Move basic focusscope examples into auto tests. | Yann Bodson | 2010-03-30 | 6 | -327/+0 |
| | | |||||
* | | Work around bad naming of exported class in symbian sdk causing conflict | Thomas Zander | 2010-03-30 | 1 | -0/+3 |
|/ | | | | | | The symbian SDK has a Time class defined which means that the compiler complains about the name already being used. Lets just disable the compile as this is not worth disturbing the example over. | ||||
* | Change and rename qml EaseFollow to SmoothedAnimation | Leonardo Sobral Cunha | 2010-03-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | Update examples/declarative.pro | Yann Bodson | 2010-03-29 | 2 | -2/+7 |
| | |||||
* | Remove colorbrowser example | Yann Bodson | 2010-03-29 | 5 | -311/+0 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-29 | 12 | -0/+381 |
|\ | |||||
| * | Add focus and key navigation example. | Yann Bodson | 2010-03-29 | 8 | -0/+209 |
| | | |||||
| * | Add example on how to use Qt widgets in qml. | Yann Bodson | 2010-03-29 | 4 | -0/+172 |
| | | |||||
* | | Update for import dir and imageProvider changes. | Warwick Allison | 2010-03-29 | 2 | -3/+14 |
|/ | |||||
* | sourceWidth/sourceHeight -> sourceSize | Warwick Allison | 2010-03-26 | 1 | -12/+11 |
| | |||||
* | Control of image rendered size (esp. SVG). | Warwick Allison | 2010-03-26 | 2 | -0/+70 |
| | | | | | | | Add Translate transform. Image::sourceWidth and Image::sourceHeight read/write properties. Task-number: QTBUG-8984 | ||||
* | Qt.Infinite -> Animation.Infinite | Michael Brasser | 2010-03-25 | 12 | -21/+21 |
| | | | | | Too misleading to have on the Qt object, as it only means infinite for animation loops. | ||||
* | Replace Animation's repeat property with loops. | Michael Brasser | 2010-03-25 | 12 | -21/+21 |
| | | | | | You can now loop a fixed number of times as well as forever. The old repeat behavior (loop forever) can be acheived with loops: Qt.Infinite. | ||||
* | Remove support for QML-in-HTML-in-WebView | Warwick Allison | 2010-03-24 | 3 | -119/+0 |
| | | | | Currently, this feature too prone to accidental misuse and abuse. | ||||
* | Show loading progress | Warwick Allison | 2010-03-23 | 3 | -2/+21 |
| | | | | Task-number: QTBUG-9260 | ||||
* | Deprecate inline Script {} blocks | Aaron Kennedy | 2010-03-22 | 5 | -194/+43 |
| | | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential. | ||||
* | Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04. | Yann Bodson | 2010-03-18 | 7 | -0/+0 |
| | |||||
* | Fix documentation | mae | 2010-03-16 | 2 | -4/+4 |
| | |||||
* | add alan's tic-tac-toe AI | mae | 2010-03-16 | 3 | -7/+151 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-16 | 16 | -47/+50 |
|\ | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-11 | 1 | -2/+2 |
| |\ | |||||
| | * | Add a positioning 'mode' to positionViewAtIndex() | Martin Jones | 2010-03-11 | 1 | -2/+2 |
| | | | | | | | | | | | | Provides more control over where and how the view is positioned. | ||||
| * | | Move particles in their own plugin (Qt.labs.particles) | Yann Bodson | 2010-03-11 | 3 | -0/+3 |
| |/ | | | | | | | Task-number: QT-2846 | ||||
| * | Document - and use - the qmlRegisterXXX template functions | mae | 2010-03-10 | 10 | -44/+43 |
| | | | | | | | | This commit removes the obsolete QML_REGISTER_TYPE macros. | ||||
| * | Merge remote branch 'qt/4.7' into qml-4.7 | Qt Continuous Integration System | 2010-03-10 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Conflicts: src/declarative/util/qdeclarativestateoperations.cpp | ||||
| | * | doc: Fixed several qdoc errors. | Martin Smith | 2010-03-09 | 1 | -0/+1 |
| | | | |||||
| * | | Oooops --- revert wrong commit | mae | 2010-03-10 | 1 | -1/+1 |
| |/ | |||||
* | | Remove WorkerListModel and integrate its functionality into ListModel. | Bea Lam | 2010-03-16 | 2 | -1/+1 |
|/ | | | | Task-number: QT-2829 | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-08 | 14 | -1/+107 |
|\ | |||||
| * | Fixed declarative examples not being installed. | Rohan McGovern | 2010-03-08 | 14 | -1/+107 |
| | | |||||
* | | Add Flipable example. | Bea Lam | 2010-03-08 | 3 | -0/+37 |
|/ | | | | Task-number: QT-2824 | ||||
* | Make compile following QDeclarativeMetaProperty renaming | Bea Lam | 2010-03-08 | 4 | -8/+8 |
| | |||||
* | Delete uninspiring example. | Yann Bodson | 2010-03-05 | 1 | -46/+0 |
| | |||||
* | Use new enum syntax for value types. | Yann Bodson | 2010-03-05 | 1 | -11/+11 |
| | |||||
* | More declarative examples cleanup. | Yann Bodson | 2010-03-05 | 3 | -20/+24 |
| | |||||
* | Improve declarative tabs example. | Yann Bodson | 2010-03-05 | 2 | -33/+60 |
| | |||||
* | declarative examples cleanup | Yann Bodson | 2010-03-05 | 7 | -40/+12 |
| | |||||
* | Remove Qt.playSound() | Michael Brasser | 2010-03-04 | 1 | -4/+8 |
| | | | | Use SoundEffect instead. | ||||
* | Make sure currentIndex is updated when view is flicked. | Martin Jones | 2010-03-03 | 1 | -0/+1 |
| | | | | Task-number: QTBUG-8396 | ||||
* | make example work again | mae | 2010-03-03 | 2 | -5/+5 |
| | | | | | The code is now a bit on the imperative side, but that was the only working solution to remove the binding loops. | ||||
* | More renaming: MouseRegion -> MouseArea | Yann Bodson | 2010-03-03 | 3 | -3/+3 |
| | |||||
* | Merge branch 'master' into 4.7 | Yann Bodson | 2010-03-03 | 5 | -0/+311 |
|\ | |||||
| * | add colorbrowser qml example | Yann Bodson | 2010-03-03 | 5 | -0/+311 |
| | | | | | | | | This example shows how to use qml packages to animate between pathview, gridview and listview. | ||||
* | | Add import Qt.widgets 4.6 to layout.qml example | Joona Petrell | 2010-03-03 | 1 | -1/+1 |
| | | |||||
* | | Adapted example to use the import mechanism | mae | 2010-03-02 | 5 | -31/+40 |
| | | |||||
* | | Merge branch 'master' into 4.7 | Warwick Allison | 2010-03-02 | 9 | -1/+9 |
|\ \ | |/ | | | | | | | Conflicts: tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp | ||||
| * | Move WebView to an extension plugin. | Warwick Allison | 2010-03-02 | 9 | -1/+9 |
| | | | | | | | | | | | | | | | | Using WebView now requires: import org.webkit 1.0 Task-number: QT-2995 | ||||
| * | Example of text focus. | Warwick Allison | 2010-03-02 | 1 | -0/+83 |
| | | | | | | | | Task-number: QT-448 | ||||
* | | Example of text focus. | Warwick Allison | 2010-03-02 | 1 | -0/+83 |
| | | | | | | | | Task-number: QT-448 |