summaryrefslogtreecommitdiffstats
path: root/examples/declarative/tutorials/samegame
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1314-14/+14
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2914-84/+84
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0114-28/+28
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1114-14/+14
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix permission (no execute bit).Frederik Gladhorn2011-11-224-0/+0
|
* Update copyright year to 2011.Jason McDonald2011-01-1014-14/+14
| | | | Reviewed-by: Trust Me
* Fix samegame tutorial jsAlan Alpert2010-10-141-1/+1
| | | | | | Turns out that subtraction is not commutative. Who knew? Task-number: QTBUG-13532
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-2914-14/+14
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Doc: Fixed text in license headers.David Boddie2010-09-1314-14/+14
|
* Fix the same bug that was in the demo samegame, in the tutorial versionAlan Alpert2010-09-031-2/+2
|
* Fix image sourceBea Lam2010-07-291-1/+1
| | | | Task-number: QTBUG-12493
* Fixing merge conflicts.Martin Smith2010-07-132-8/+10
|\ | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| * Follow -> Behaviormae2010-07-082-8/+10
| | | | | | | | Replace the usages of Follows with Behaviors, update docs.
* | Doc: Fixing typo - background file nameMorten Engvoldsen2010-07-081-1/+1
|/
* Improve input panel handling in declarative demos and examplesJoona Petrell2010-06-031-2/+10
| | | | | Task-number: QTBUG-11157 Reviewed-by: Warwick Allison
* Add license headers for .qml files.Jason McDonald2010-05-2114-0/+560
| | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-203-6/+6
| | | | QDeclarativeComponent)
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-0514-99/+153
|\
| * Doc improvements, simplify example codeBea Lam2010-05-0514-99/+153
| |
* | Make component.createObject require a parent argumentAlan Alpert2010-05-053-6/+3
|/ | | | | | | | | For graphical objects (the common case) a common mistake is to not parent a dynamically created item. Since you almost always want to add a parent, and it's hard for a beginner to diagnose this problem, a parent is now a required argument and dealt with by the createObject function. Task-number: QTBUG-10110
* Remove Component's isReady, isLoading, isError and isNull properties.Bea Lam2010-04-293-12/+12
| | | | | | | The Component status enum covers all of these properties already and removing these also makes the API consistent with Image and Loader. Note this change only affects the QML Component API; the methods are still available for QDeclarativeComponent.
* Link to example files from tutorial pagesBea Lam2010-04-234-0/+64
|
* Replace usage of print() with console.log().Michael Brasser2010-04-233-12/+12
|
* Make the dynamic creation functions on the Qt objectAlan Alpert2010-04-213-3/+3
| | | | | | | | | Also updated examples to still work, and the dynamic example now uses exceptions a little, to demonstrate that it can be done. Exceptions are also now filled out with the QML error data. Task-number: QT-2801 Reviewed-by: Aaron Kennedy
* Indentation and whitespace fixes in qml's samegame tutorialLeonardo Sobral Cunha2010-04-1913-23/+23
|
* Make demo code more consistent with example code in terms of variableBea Lam2010-04-131-1/+1
| | | | naming and code style.
* Fix score from previous changeBea Lam2010-04-131-1/+1
|
* Doc improvementsBea Lam2010-04-131-1/+1
|
* Fix example code styleBea Lam2010-04-1314-124/+206
|
* Example code style improvementsBea Lam2010-04-097-206/+195
|
* More tutorial improvmentsBea Lam2010-04-098-119/+107
|
* 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-0815-28/+19
|\ | | | | | | | | Conflicts: examples/declarative/tutorials/samegame/samegame4/content/samegame.js
| * Fix samegame4 tutorial codeLeonardo Sobral Cunha2010-04-082-12/+3
| |
| * Renamed 'source' property from SpringFollow to 'to'Leonardo Sobral Cunha2010-04-081-2/+2
| |
| * Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-0814-14/+14
| |
* | Improve example code - rename variables, remove redundant ids.Bea Lam2010-04-0813-156/+156
|/
* Doc improvements, fixesBea Lam2010-04-0113-31/+31
|
* Move particles in their own plugin (Qt.labs.particles)Yann Bodson2010-03-111-0/+1
| | | | Task-number: QT-2846
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-03-0226-15/+15
|\ | | | | | | | | | | Conflicts: demos/declarative/minehunt/main.cpp demos/declarative/minehunt/minehunt.qml
| * Make SameGame tutorials share imagesAlan Alpert2010-03-0126-15/+15
| | | | | | | | | | | | | | | | | | It's a bit of a waste to have four copies of all of the images. And as an advanced tutorial throwing in a minor complication like this is probably beneficial. Additionally, the background has been replaced by a smaller JPEG version.
* | Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-023-5/+5
|/ | | | | | | | | | | | | | | | | | | | | Where you would have written x: NumberAnimation {} y: Behavior {} you now must write NumberAnimation on x {} Behavior on y {} This change also makes the parser more strict with respect to multiple assignments to a single property - they're no longer allowed. For example this x: 10 x: 11 is now an error.
* Rename MouseRegion -> MouseAreaMartin Jones2010-02-228-8/+8
|
* Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-181-1/+1
| | | | | | | | | | | has proven to be confusing in practice. property/target and properties/targets will be functionally equivilant (the only distinction being singular/plural). In a transition these properties can be used for both 'matching' and explicit animation based on whether a 'to' value is supplied. The documentation, tests, examples and demos have been updated as well.
* Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-039-33/+33
| | | | | | examples accordingly. Task-number: QT-2786
* Update advanced tutorial with new imagesAlan Alpert2010-02-018-0/+0
| | | | | | Some of the images used in the example and documentation were still with the old graphics. This has been fixed so as to only use the new graphics.
* Remove samegame README (mentioned images have been replaced)Kai Koehne2010-01-221-10/+0
|
* Copy updated images from demos/samegame to samegame tutorialKai Koehne2010-01-225-0/+0
|
* Fix use of XmlHttpRequest in examplesAlan Alpert2009-11-271-0/+1
|
* Use console.log, not printWarwick Allison2009-11-231-1/+1
|
generated by cgit v0.12 at 2025-04-10 00:29:45 (GMT)