aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into stableSergio Ahumada2013-03-208-3/+194
|\ | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
| * photosurface example: simplify PinchArea usage; fileUrls; licenseShawn Rutledge2013-03-151-41/+33
| | | | | | | | | | | | | | | | | | | | FileDialog.filePaths was changed to fileUrls. No need to do so much scripting because the PinchArea.target takes care of the math already, and with better rotational symmetry too. Example QML should have a BSD license. Change-Id: I892292574c81c032d948c1c2d4924fc7127dd008 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * Add QtQml.Models moduleAlan Alpert2013-03-123-3/+6
| | | | | | | | | | | | | | | | | | | | | | The moved Model classes can now be exposed in a QtQml import. To keep the QtQml import resticted to more core functionality, they are being exposed in a plugin module. Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Added photosurface example to demo PinchArea/MouseArea togetherShawn Rutledge2013-03-045-0/+196
| | | | | | | | | | | | | | | | It seems to be important to put the MouseArea inside the PinchArea in order to support simultaneous drag/rotate/pinch. Change-Id: Ic3ec6a131bd2d4c7f8a8560cd9c3015a717fef20 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Add clocks.qmlprojecthjk2013-03-141-0/+8
|/ | | | | | Change-Id: I4fb063d1a4ccc990b5098237f1784b3dce015a81 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: Fix paths and add missing project files for QML and Quick examplesTopi Reinio2013-02-201-1/+1
| | | | | | | | | | This change fixes a number of 'example path does not exist' warnings from qdoc, and adds .qmlproject files for pure qml examples so they'll appear correctly in the example manifest files. Change-Id: Id0a424c4826fb5d8ebe6c3309bf33b976ff8477c Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1084-84/+84
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Improved cosmetics for StockQtJens Bache-Wiig2012-12-138-45/+76
| | | | | | | | This will not get us any design awards but it looks a bit more professional than the original. Change-Id: Ib01a20ebad5888af44c174cbd493ce8d99dcf7b6 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Clean up the StockQt demoJens Bache-Wiig2012-12-1310-789/+726
| | | | | | | | | I cleaned up the whitespace, property declarations and removed some console output. No changes to the functionality or design. Change-Id: I499f6d061e43bf2e187eebc026858b3abd21a9b0 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Fix StocQt buttonsAlan Alpert2012-12-124-155/+124
| | | | | | | | They're now on screen and using better componentization for the styling. Task-number: QTBUG-28291 Change-Id: If21712e523c706ee05d257e209ed71dd61acf2dc Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Use resource files for most examplesKai Koehne2012-12-1215-20/+222
| | | | | | | | | Make examples shadow-build-friendly by using resource files instead of trying to derive the qml path from applicationDirPath(). Change-Id: I669424554c772d9b261249b366247190f5fbd8b1 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-12-10241-0/+10007
follow respective change in qtbase Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>