summaryrefslogtreecommitdiffstats
path: root/examples/declarative/toys
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-166-0/+0
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Attribute change to allow inclusion of image files.
| * Attribute change to allow inclusion of image files.Toby Tomkins2010-06-166-0/+0
| |
* | Improve input panel handling in declarative demos and examplesJoona Petrell2010-06-032-2/+12
|/ | | | | Task-number: QTBUG-11157 Reviewed-by: Warwick Allison
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-268-190/+1
|\ | | | | | | | | Conflicts: examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
| * Integrate some QML examples and demos into qtdemoAlan Alpert2010-05-249-191/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Includes minor changes and additions to the existing doc and examples, so that they follow Qt conventions better. Note that while blurring the background was part of the plan for the embedded QML viewer I could not get it to perform well enough. In the future, when blur is fast enough (or someone else can get it to perform better than I) -use-blur should become the default, and -no-blur the option. Task-number: QTBUG-10582
* | Clean up and don't allow clicks on already filled placesBea Lam2010-05-243-139/+149
|/
* Add license headers for .qml files.Jason McDonald2010-05-2116-0/+640
| | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* Make dynamicscene example embeddeable in another graphics sceneAlan Alpert2010-05-201-1/+1
|
* Some minor example fixesAlan Alpert2010-05-208-0/+37
| | | | | | -dial moved to dial-example so the dirname is the same as the qml name -added rssnews to .pro so it can be installed -added some README files like the other dirs
* Fix incorrect mergeAlan Alpert2010-05-201-1/+1
| | | | Didn't actually notice the name change of that function
* Fix dynamicscene exampleAlan Alpert2010-05-193-5/+16
| | | | | | | In all the renaming (presumably) the moon broke, now fixed. Also made it slightly smaller, to be friendlier to desktop systems with small screens (and the fixed size qtdemo)
* Rename some examples: proxyviewer -> networkaccessmanagerfactory,Bea Lam2010-05-1821-0/+0
| | | | proxywidgets -> qwidgets, dynamic -> dynamicscene, velocity -> corkboards
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-172-2/+14
| | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Focus should be applied to focus scopes all the way up the chain, not Add focus docs snippets Fix doc for status, add Image::onLoaded. Don't crash due to recursive positioning. ListModel::get() shouldn't print warnings for invalid indices since it Add \brief to TextInput Add missing .pro Restructure the examples. They are now organized into various graphicsWidgets doc example was previously removed Doc fix Add a "priority" property to Keys and KeyNavigation
* Restructure the examples. They are now organized into variousBea Lam2010-05-1649-0/+1180
subdirectories to make it easier to locate examples for certain features (e.g. animation) and to distinguish between different types of examples (e.g. very basic examples vs complex demo-like examples).