aboutsummaryrefslogtreecommitdiffstats
path: root/examples/declarative/qtquick1
Commit message (Collapse)AuthorAgeFilesLines
* Fix range checking in AbstractItemModel examplesMatthew Vogt2012-01-191-1/+1
| | | | | | | | Fix range checking in AbstractItemModel examples Task-number: QTBUG-23574 Change-Id: I6f2d4c18e1fb33ee369ebc75f501e524e8e63615 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-176-6/+6
| | | | | | | | Update copyright headers from before 2011, and a couple of new ones that were merged after the previous change to copyright headers. Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-05231-231/+231
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Examples: Remove commented out 'plugins' list from .qmlproject filesKai Koehne2012-01-0465-142/+0
| | | | | Change-Id: I24bacdd52f2f191dde8e0a2fa9718b38ab329597 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Examples: Hard-code the 'main' file in .qmlprojectKai Koehne2012-01-0342-41/+133
| | | | | | | | | | | Set the 'mainFile:' property in .qmlproject files where it makes sense (i.e. there's one natural candidate). This makes sure Qt Creator doesn't fall back to 'current file in editor' as main file, which is unexpected to a lot of people. (This requires Qt Creator version 2.2 and newer). Change-Id: Ia5d20b0d982038520d7892bca155267c5f13644b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-09-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
* Add examples and tests for QtQuick1Damian Jansen2011-09-05485-0/+25351
A straight copy of what was available in Qt 4.7, modified where necessary to use the QtQuick1 module, so as to still compile and run in Qt5. Change-Id: I9a95afb96e3f522fbd600eb6dbd3fdac9558b059 Reviewed-on: http://codereview.qt.nokia.com/4019 Reviewed-by: Bea Lam <bea.lam@nokia.com>