summaryrefslogtreecommitdiffstats
path: root/examples/declarative/tutorials/samegame/samegame3/samegame.qml
Commit message (Collapse)AuthorAgeFilesLines
* Updated year in copyright headerKai Koehne2014-03-261-1/+1
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
| | | | | | 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-291-6/+6
| | | | | | | | 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-011-2/+2
| | | | | | | | | | | | | - 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-111-1/+1
| | | | | | | | | 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>
* Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | Reviewed-by: Trust Me
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-291-1/+1
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Doc: Fixed text in license headers.David Boddie2010-09-131-1/+1
|
* Add license headers for .qml files.Jason McDonald2010-05-211-0/+40
| | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* Doc improvements, simplify example codeBea Lam2010-05-051-6/+8
|
* Indentation and whitespace fixes in qml's samegame tutorialLeonardo Sobral Cunha2010-04-191-1/+1
|
* Fix example code styleBea Lam2010-04-131-14/+20
|
* More tutorial improvmentsBea Lam2010-04-091-4/+4
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-081-1/+1
|\ | | | | | | | | Conflicts: examples/declarative/tutorials/samegame/samegame4/content/samegame.js
| * Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-081-1/+1
| |
* | Improve example code - rename variables, remove redundant ids.Bea Lam2010-04-081-1/+1
|/
* Doc improvements, fixesBea Lam2010-04-011-4/+3
|
* Make SameGame tutorials share imagesAlan Alpert2010-03-011-1/+1
| | | | | | | | | 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.
* Rename MouseRegion -> MouseAreaMartin Jones2010-02-221-1/+1
|
* Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-031-5/+5
| | | | | | examples accordingly. Task-number: QT-2786
* Use darker() and lighter() functions from global Qt object rather than from ↵Yann Bodson2009-11-051-1/+1
| | | | SystemPalette.
* cleanupYann Bodson2009-10-281-1/+1
|
* doc cleanupYann Bodson2009-10-081-4/+4
|
* Switch Same Game tutorial to using snippets properlyAlan Alpert2009-10-071-0/+6
|
* Add SameGame based advanced tutorialAlan Alpert2009-10-071-0/+56
Could use some cleanup, as I didn't manage to get code snippets working correctly. Also might benefit from being re-written by a good tutor.