aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick
Commit message (Collapse)AuthorAgeFilesLines
* Fix installation of examples.Christian Kandeler2012-11-2222-38/+81
| | | | | | | | | | Enable examples to be built in the target tree. This entails installing the project files and possibly other missing stuff. Task-number: QTBUG-27977 Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-2016-3/+207
|\ | | | | | | Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25
| * Doc: Moved all content in the doc directory.Venugopal Shivashankar2012-11-0816-3/+207
| | | | | | | | | | | | | | | | | | - most images to the corresponding examples directory - Fixed a few broken links to the examples and qdoc pages - removed the obsolete and unused images and qdoc pages Change-Id: I18f9551b42ec713b81e3f69694a2bd04b1ebf794 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | Install the Qt Quick 2 examples in the "qtquick" dirThiago Macieira2012-11-0916-33/+33
|/ | | | | | | | Leave the "qtdeclarative" dir for Qt Quick 1, which is where it used to be in Qt 4. Change-Id: I44997771d77617564fc608c1aba95e3ada8f9a69 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Update Nokia references to Digia's.Caroline Chao2012-11-011-1/+1
| | | | | | Change-Id: I3be91d4a6a1116c79ab6aca89d189c88a265d339 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove interim compatibility measuresAlan Alpert2012-10-161-3/+3
| | | | | | | | Also update some variables in qtdeclarative which failed to update rootItem->contentItem. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Fix imageelements example deploymentTopi Reinio2012-10-121-1/+1
| | | | | | | | Some of the .qml files were missing from INSTALLS Task-number: QTBUG-26996 Change-Id: I9508ca3c43f354a16405af68dbca0133117ee2e2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add missing contents dir to installation of canvas exampleMiikka Heikkinen2012-10-101-1/+1
| | | | | | | Task-number: QTBUG-26995 Change-Id: Ib346c857f9e0bc97bb2e4365abddb6475c7142d4 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-23201-1716/+1717
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Examples: Moved example documentation.Jerome Pasion2012-09-2172-402/+3113
| | | | | | | | | -inline \example pages into separate .qdoc files -fixed broken links to paths -moved ui-components under examples/quick Change-Id: I6e009b9213be3e1f4bed51bdbeb76a7a2142c80b Reviewed-by: Martin Smith <martin.smith@digia.com>
* doc: fix some typos in .qml filesSergio Ahumada2012-09-072-2/+2
| | | | | Change-Id: Ice5d60b06ec9ab81fbd98fd1679c8834f3018938 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Update usage of smooth and antialiasing.Michael Brasser2012-08-2830-152/+28
| | | | | | Change-Id: Icc8b28bdd466389ed3f269f076f1bdb6e9abe3f2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Remove deprecated openSoftwareInputPanel function calls from the declarative ↵Joona Petrell2012-08-222-2/+2
| | | | | | | examples Change-Id: I458bb1ed08f587b13a52a2615ba4d7966363a12b Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Three scene graph examples with docs.Gunnar Sletta2012-08-1318-21/+970
| | | | | | | | How to make a custom QSGGeometry, how to use QSGSimpleMaterial and how to use render with raw GL. Change-Id: I3e5a32b6ae12d7d781c11050ed26a54845e92cca Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* More consistent examples directory structureAlan Alpert2012-08-1065-105/+2244
| | | | | | | | Under examples the next directory level distinguishes imports/modules and the next directory level distinguishes examples. Change-Id: Icabadaac6ccb9c1c424efa9c9e64a7d94bc7c0da Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Uncomment examples in pro fileAlan Alpert2012-08-091-12/+12
| | | | | | | | Examples all seem to build and install fine, and no task number was mentioned in the pro file. Change-Id: Ie836385683287467618749456247684456721866 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Refactor context2d thread logicCharles Yin2012-07-318-161/+0
| | | | | | | | | | 1. Use QQuickContext2DRenderThread for Threaded rendering 2. Make FBO target works with all render strategies 3. Remove some unnessary locks, call texture methods by invoking meta calls 4. Run existing tests with all render targets and strategies (except Cooperative) Change-Id: I0db5c91d848b86bcc1536c30d7a5804b66a817f1 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Empty JSON files are not needed for the plugin systemAlan Alpert2012-07-252-2/+1
| | | | | Change-Id: I8df57ed1ced8128723d790c30c00ccaba0a2787d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QQuickCanvas renamesAlan Alpert2012-07-172-5/+5
| | | | | | | | | | | | | | | | QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Rename speed -> velocity in the particle systemAlan Alpert2012-06-292-6/+6
| | | | | | | | Matches the convention set in the QtQuick module, for example by ListView and Flickable. Change-Id: I8df57ed1ced8128723d790c30c00cc1b2062787d Reviewed-by: Bea Lam <bea.lam@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-261-3/+0
| | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Install examples to example hierarchyroot2012-06-228-16/+16
| | | | | | | | Some examples were installing to an old path of qtdeclarative/qtquick Task-number QTBUG-26205 Change-Id: I6e1840b1f1a87e24c1728de1b7320d6738bd530e Reviewed-by: Martin Jones <martin.jones@nokia.com>
* dynamiclist example used different delegate height for anim and staticMartin Jones2012-06-221-2/+2
| | | | | | | | | so delegates added later weren't the same size as the original items. Set a better value for both. Task-number: QTBUG-26206 Change-Id: Ic9d32528eb43a77e23e3a619834da098f177b5d6 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Don't use QtDeclarative compat moduleKent Hansen2012-05-118-8/+8
| | | | | | | Use QtQml instead. Change-Id: If899ebc1e0b4ea86f0f8d4369fbd3eb5cbb2181c Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Remove QSGEngineGunnar Sletta2012-05-031-1/+0
| | | | | Change-Id: Iaab0d9f607b1f4ca6dfb13495a456d1b31bb980a Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* populate transition for positionersBea Lam2012-05-012-14/+34
| | | | | | | | | | Fix positioners to apply a "populate" transition for initially added items. This is consistent with ListView and GridView and also fixes the behaviour from QtQuick 1.x where the positioners were instead running the "move" transition for initially added items. Change-Id: Ib43f1141ce3e7379df085c178b684f89b8567403 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Elaborate on drag and drop and model view examples with snippets.Andrew den Exter2012-04-3012-43/+106
| | | | | Change-Id: I8a6874c4bb480ed9bcc59e743b97d439f053840e Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix typo in documentationYann Bodson2012-04-271-1/+1
| | | | | Change-Id: Ia3cc61b2af7a68e15ad9668dc67275e8a2386a8c Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Expound on canvas example documentationAlan Alpert2012-04-265-16/+30
| | | | | Change-Id: I5bf82697dcbadaa9dc58e11ee22b2ab8c1a28852 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* More example docsAlan Alpert2012-04-2610-8/+60
| | | | | | | MouseArea, Threading and TouchInteraction Change-Id: I9ca812d20a6c87d68ef91066ae0a4b9bc8829478 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Flesh out examples documentationAlan Alpert2012-04-2612-1/+47
| | | | | Change-Id: I4f7a1ce6b9957f43e442947dc6b319e919ec9cf7 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Improve examples documentationYann Bodson2012-04-209-8/+86
| | | | | | | | Add more details and snippets to the examples for text and imageelements. Change-Id: If0b20a0dca1778a8a4cc0ebf1e43017bdce839ec Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Improve example documentationAlan Alpert2012-04-204-1/+37
| | | | | | | | Add more detail and snippets to the examples for shadereffects and positioners. Change-Id: I62a257289cbfb6c53ecc092ac898d923f0058248 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Add contains method to QQuickItem public APIAdriano Rezende2012-04-199-0/+461
| | | | | | | | This method can be overwritten in order to provide fine grained control over the mouse events handled by the item. Change-Id: I23cb61958d3ac0b2f5091c47fa9e0ed07dc5e5d0 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Scattered example fixesAlan Alpert2012-03-316-14/+58
| | | | | | | | Some using of pixel size, some moving an image because individual sub-examples shouldn't depend on the shared folder. Change-Id: If0f66f805f5fc9bcbf9b870274adac404466ec08 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Tidy up examples documentationAlan Alpert2012-03-2811-11/+12
| | | | | | | | | Add missing doc images, move documentation into examples directory, and update example doc references to the new locations (quick/qml instead of declarative or qtquick). Change-Id: I67a9302f2b451b8bf30f4ca6b625f54b240da429 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Reduce assumptions in examplesAlan Alpert2012-03-281-5/+6
| | | | | | | | | | | -dynamic scene, don't set duration on running animation (doesn't work) -dynamic scene, just use set colors instead of system palette (in case platform doesn't support it right, like N900) -dynamic scene, calculator and shadereffects, don't rely on root item being automatically in scope (possibly confusing) Change-Id: I1eec018d5387424dc6b07bf51c1b2184b3048553 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Update model view examples to common launcher format.Andrew den Exter2012-03-2211-245/+235
| | | | | | Change-Id: I8dc30a9ade3cbbfa91d51d85617975ad7d46ee15 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update touchinteraction examples to new guidelinesAlan Alpert2012-03-208-42/+153
| | | | | | | Includes adding flickable examples Change-Id: Ie1a47882bcb8b671f162b2b778dad33ce105407b Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add docs for PaintedItem examplesAlan Alpert2012-03-202-84/+37
| | | | | | | No launcher, because they're C++ examples Change-Id: Icff2ad31c65d5a878c3818d54ed81cf0d6aa664b Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Update Squircle example towards new guidelinesAlan Alpert2012-03-202-3/+6
| | | | | | | Doesn't work properly though. QTBUG-24566 filed for that. Change-Id: I31a8184456add6060e65bf11323153dc7a80b306 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Update MouseArea and KeyInteraction to new guidelinesAlan Alpert2012-03-208-1/+202
| | | | | Change-Id: Icf207005a48fa2a994632a88c4238d821622133c Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Adapt threading examples to new launcher formatAlan Alpert2012-03-204-0/+133
| | | | | Change-Id: Ibfe8732efb71ff49c19724abb8202ca63262150e Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Rewrite workerscript exampleAlan Alpert2012-03-203-33/+141
| | | | | | | | Clearer function, arguable justification for using WorkerScript, and fits better into the standrad form factor. Change-Id: I3f29f19961a12adc29b260b3284eb620ad63bf45 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Fix failed rebaseAlan Alpert2012-03-192-0/+129
| | | | | Change-Id: I5d6c6bb50baaa4c1ba986de779bad04ba45947fa Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix mergeAlan Alpert2012-03-151-0/+84
| | | | | | | Examples are in quick, not qtquick, since the rename merge. Change-Id: Ideb677752c3ea320bbddba49204d37e8a34e2609 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* fix gl under example to work also on trivial render loopGunnar Sletta2012-03-142-2/+3
| | | | | Change-Id: Ieb6c9c9646b557a7cca952472325c33d265c9262 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Refactor canvas examples by following the new example guidelines.Charles Yin2012-03-1420-1755/+180
| | | | | Change-Id: I1cc749ad11b8439239ba739f40e99b78af7351ab Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Update righttoleft examples to new form factorAlan Alpert2012-03-097-181/+229
| | | | | Change-Id: I2591f45a91da8bad90c5f3b9c963199c57bcf74d Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Update text examples to new guidelinesAlan Alpert2012-03-0910-75/+96
| | | | | Change-Id: I6bbf414f3734bc2f29a7182746c5df158a5924da Reviewed-by: Yann Bodson <yann.bodson@nokia.com>