summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix call to saveHighScores() and restore game timer.Bea Lam2010-04-083-6/+4
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-08301-1013/+2210
|\ | | | | | | | | Conflicts: examples/declarative/tutorials/samegame/samegame4/content/samegame.js
| * Make string -> int conversion consistent in bindingsAaron Kennedy2010-04-085-0/+115
| | | | | | | | QTBUG-9538
| * Improve static assignment to QVariant's in the int and double caseAaron Kennedy2010-04-088-7/+110
| |
| * Fix warning in declarative/examples/velocityLeonardo Sobral Cunha2010-04-081-2/+6
| |
| * Fix samegame4 tutorial codeLeonardo Sobral Cunha2010-04-082-12/+3
| |
| * Missing fileYann Bodson2010-04-081-0/+0
| |
| * Update QmlChanges for SmoothedFollowLeonardo Sobral Cunha2010-04-081-4/+12
| |
| * Renamed 'source' property from SpringFollow to 'to'Leonardo Sobral Cunha2010-04-0816-56/+64
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0818-96/+232
| |\
| | * Make script and binding assignments identical for list propertiesAaron Kennedy2010-04-081-1/+5
| | |
| | * Fix qdeclarativeecmascript::arrayExpression() testAaron Kennedy2010-04-081-1/+1
| | |
| | * Cleanup handling of errors in bindings and scriptsAaron Kennedy2010-04-0818-96/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML used to silently ignore a log of errors - such as a failed assignment to a QObject property. These errors are now all reported as exceptions in JavaScript. Other questionable activities, like assigning a JavaScript array to a "property var" property which appeared to work, thanks to QtScript's transparent conversion of arrays to a QVariantList, are now blocked entirely. QTBUG-9152 QTBUG-9382 QTBUG-9341 QTBUG-6886
| * | Add running of examples to quality gate.Warwick Allison2010-04-086-7/+8
| |/ | | | | | | Fix broken examples too.
| * Improve velocity exampleYann Bodson2010-04-084-135/+84
| |
| * Missing fileAaron Kennedy2010-04-082-1/+146
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-08205-216/+939
| |\
| | * Fix tst_qdeclarativesmoothedanimation::behaviorLeonardo Sobral Cunha2010-04-081-2/+3
| | | | | | | | | | | | Added an 'id' to the animations inside Behaviors to avoid deferred creation.
| | * Add SmoothedFollow element to qmlLeonardo Sobral Cunha2010-04-0813-1/+695
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SmoothedFollow is the same as the old EaseFollow, so it's not an animation, but its main use case is to be used as a property value source to automatically follow the 'to' property, as in the example below. Rectangle { color: "green" width: 60; height: 60; SmoothedFollow on x { to: rect1.x - 5; velocity: 200 } SmoothedFollow on y { to: rect1.y - 5; velocity: 200 } } This element shares the internal implementation with SmoothedAnimation, both providing the same easing function, but with SmoothedFollow it's easier to set a start value to animate intially and then start to follow, while SmoothedAnimation is still convenient for using inside Behaviors and Transitions. Reviewed-by: Michael Brasser
| | * Tracking the velocity when restarting SmoothedAnimationLeonardo Sobral Cunha2010-04-081-0/+2
| | |
| | * Fix doc of qml's SmoothedAnimationLeonardo Sobral Cunha2010-04-081-9/+10
| | |
| | * Refactor in smoothedanimation, removed unneeded codeLeonardo Sobral Cunha2010-04-082-6/+1
| | |
| | * Do not create a QScriptValue for an object being deletedAaron Kennedy2010-04-081-0/+3
| | |
| | * Autotest for 76f5e9e7d1eea8d688d5459b7b7b2bfa3f9057edAaron Kennedy2010-04-082-1/+19
| | |
| | * Fix test.Michael Brasser2010-04-081-0/+1
| | |
| | * Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-08183-196/+196
| | |
| | * Don't optimized extended type constructionAaron Kennedy2010-04-083-1/+9
| | |
| * | Test readonly valuetypes. Fails for field.Warwick Allison2010-04-085-0/+51
| | | | | | | | | | | | Task-number: QTBUG-9685
| * | Fix AnimatedImage for remote image test. Fix and test sourceSize property.Warwick Allison2010-04-086-2/+44
| | |
| * | Ignore current spurious warnings.Warwick Allison2010-04-081-0/+10
| | | | | | | | | | | | Task-number: QT-3245
| * | unwarnWarwick Allison2010-04-081-0/+2
| |/
| * Correctly handle shutdown order in the presence of QWidgetsAaron Kennedy2010-04-081-1/+1
| | | | | | | | | | The QWidget destructor is largely a copy of the QObject destructor. QML shutdown occurs in a slightly different order in this case.
| * Initialize QDeclarativeData even when not using a QDeclarativeEngineAaron Kennedy2010-04-082-5/+14
| | | | | | | | Caused crashes in various test cases
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0814-46/+76
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0811-301/+286
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0819-615/+242
| | |\ \
| | * | | Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-0814-46/+76
| | | | | | | | | | | | | | | | | | | | wrap remains for a little while, and will produce a warning.
| * | | | Remove usage of Script where not actually testing the obsolete construct.Warwick Allison2010-04-081-4/+3
| | | | |
| * | | | Test import of a script requires qualifier.Warwick Allison2010-04-083-0/+6
| | | | |
| * | | | Fix location of error message.Warwick Allison2010-04-081-2/+2
| | | | |
| * | | | Remove error-tests of obsolete Script element.Warwick Allison2010-04-0825-120/+0
| | |_|/ | |/| |
| * | | Remove usage of Script where not actually testing the obsolete construct.Warwick Allison2010-04-081-3/+1
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-089-55/+89
| |\ \ \ | | | |/ | | |/|
| * | | Remove usage of Script where not actually testing the obsolete construct.Warwick Allison2010-04-088-293/+279
| | | |
| * | | Pass again, now that version must exist in order to be imported.Warwick Allison2010-04-082-5/+6
| | | |
* | | | Improve example code - rename variables, remove redundant ids.Bea Lam2010-04-0813-156/+156
| |/ / |/| |
* | | Revert "Add QListModelInterface::modelReset() signal and emit this in"Bea Lam2010-04-086-43/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 973cfce37fcdd1ce330f237eaa76930db55a73f6. Need more consideration before adding modelReset(). For example if item insertion/removal is supposed to trigger animations through added/removed signals, they won't be triggered if only the modelReset() signal is emitted. Also if we add modelReset(), it should also be implemented for ListModel to make sure it is implemented by all subclasses of QListModelInterface and to test the impact of this on the view classes.
* | | Prevent Behavior from being triggered on initialization.Michael Brasser2010-04-083-12/+43
|/ / | | | | | | Task-number: QTBUG-6332
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0817-511/+154
|\ \
| * | Remove flickr-desktopYann Bodson2010-04-086-500/+1
| |/