aboutsummaryrefslogtreecommitdiffstats
path: root/examples/declarative/qtquick1/cppextensions
Commit message (Collapse)AuthorAgeFilesLines
* Remove Symbian specific code.Xizhi Zhu (Steven)2012-01-243-24/+0
| | | | | Change-Id: Ifbcc92f1d44d46760ac7c5be24a997384fa22266 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2385-85/+85
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-172-2/+2
| | | | | | | | 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-0583-83/+83
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Examples: Remove commented out 'plugins' list from .qmlproject filesKai Koehne2012-01-047-14/+0
| | | | | Change-Id: I24bacdd52f2f191dde8e0a2fa9718b38ab329597 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-05138-0/+7966
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>