aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-04-172-4/+4
|\ | | | | | | Change-Id: I39905acde16ba6bb0ba39401cb73082a73dd9167
| * Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-04-1126-101/+186
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/debugger/qqmlprofilerservice_p.h src/qml/qml/qqmlboundsignal.cpp src/qml/qml/v4/qv4bindings.cpp src/quick/items/qquickshadereffect.cpp src/quick/particles/qquickcustomparticle.cpp src/quick/qtquick2.cpp Change-Id: Ia9c6517035ae912fa75e77473a452bd3383def56
| * \ Merge master into api_changesKent Hansen2012-03-2352-415/+1110
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlboundsignal.cpp src/qml/qml/qqmlpropertycache.cpp Change-Id: I5193a193fa301c0b518291645bf626a5fa07118f
| * | | Fix the build & docs after QQmlImageProvider was renamedKent Hansen2012-03-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class was renamed to QQuickImageProvider in commit 3bc907d155034fe64efc8cb6056b48f0c6401bfb. Change-Id: I91ff38244cee3ab651ed6caa4140a58cb742f1c9 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | | | Fix broken stockchart demoCharles Yin2012-04-178-1/+448
| |_|/ |/| | | | | | | | | | | Change-Id: Ie0118579cc57e9406044d763e699cb1aa66bd6cd Reviewed-by: Alan Alpert <alan.alpert@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-2816-32/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-286-55/+45
| |/ |/| | | | | | | | | | | | | | | | | | | -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 samegame demo to new layoutAlan Alpert2012-03-229-4/+200
| | | | | | | | | | Change-Id: Ib9cf4fb29022c63ce24f7b8c7ca4ff17c149a9cb 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 tutorialAlan Alpert2012-03-213-3/+3
| | | | | | | | | | | | | | Updated paths, and updated arbitrary form factor Change-Id: I10ffedd6978fbe62050987a4e0e5ab8b120edfce Reviewed-by: Yann Bodson <yann.bodson@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/+0
|/ | | | | Change-Id: I5d6c6bb50baaa4c1ba986de779bad04ba45947fa Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix mergeAlan Alpert2012-03-151-0/+0
| | | | | | | 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-1423-85/+251
| | | | | Change-Id: I1cc749ad11b8439239ba739f40e99b78af7351ab Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Refactor XMLHttpRequest example.Charles Yin2012-03-135-0/+132
| | | | | Change-Id: I4fd4fa4fb190814e1e32ce847d05ab0015ad4ca0 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Refactor localstorage exampleCharles Yin2012-03-134-1/+132
| | | | | Change-Id: I0c742c35ba8d5a2812dc1665905e45f5ffb745b5 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add mouse wheel events handler to MouseAreaLuis Gabriel Lima2012-03-101-0/+84
| | | | | | | | | | | | This patch was based on the attached patch in QTBUG-7369. It basically exposes the wheel events to MouseArea via the onWheel signal. The current API is based on the new QWheelEvent API introduced by this patch: http://codereview.qt-project.org/#change,12532 Task-number: QTBUG-7369 Change-Id: Id58513715c2d0ae81e3a69e9e1ed400bbae07507 Reviewed-by: Michael Brasser <michael.brasser@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>
* Update shadereffects example to new guidelinesAlan Alpert2012-03-094-241/+308
| | | | | Change-Id: Ifa4f06cbf990a2f3fd1c46a3c4fda02b5c42d15b Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Update positioners examples to new guidelinesAlan Alpert2012-03-098-266/+326
| | | | | Change-Id: I197a94bca26adbb79f1822b693fa73109db5a4ac Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Improve accessibility action support for Qt QuickMorten Johan Sorvig2012-03-074-3/+147
| | | | | | | | | | | Add interface_cast for the action interface. Implement actions for the following roles: Button : Press CheckBox, RadioButton : Press, Check, Uncheck Slider, Spinbox, Dial, ScrollBar : Increment, Decrement Change-Id: Ic8e0d17c709ba51655f3f4b699092baf603b6f18 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix renaming merge with examplesAlan Alpert2012-03-06737-40892/+0
| | | | | | | Some examples were duplicated a few times. Removing the excess. Change-Id: I6fa59f79de63ac952103421ba1c063f5912b702b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge master <-> api_changesMatthew Vogt2012-03-05768-59/+41326
|\ | | | | | | Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
| * Use view transitions in drag'n'drop exampleBea Lam2012-03-021-1/+5
| | | | | | | | | | Change-Id: Idc661225acf9e517d26928cafba650ac48ca880a Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Update ImageElement examplesAlan Alpert2012-03-019-36/+214
| | | | | | | | | | | | | | | | | | Now more consistently formed. Required a UI redesign for border image, you now view one at a time, with a selector control. Change-Id: Idf64119b644c1a79779ea0a46412247d6d013cb1 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
| * Examples guidelines have changes slightlyAlan Alpert2012-02-281-3/+3
| | | | | | | | | | | | | | Update docs to current thinking. Change-Id: Ide00240f4d779549eebdc81592f3f2104dfd759a Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Move some toys back to examplesAlan Alpert2012-02-2822-1/+4
| | | | | | | | | | | | | | | | | | tvtennis, corkboards and dynamicscene are more examples than demos. clocks and tic-tac-toe are remaining demos for now. Change-Id: I3d9501a4742349a9eb7efdad0d06aa6e7cb02c14 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Update drag and drop examples to new guidelinesAlan Alpert2012-02-289-27/+157
| | | | | | | | | | Change-Id: Ib09a50015eaf7e79f21ade5df3cbd3b58b89c83d Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Rename SpriteImage to SpriteSequenceAlan Alpert2012-02-2811-35/+35
| | | | | | | | | | | | | | Also rename Sprite::frames->Sprite::frameCount Change-Id: I2e7a71adc37044fd696ffda2a5da4835725ba3a8 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Add AnimatedSpriteAlan Alpert2012-02-281-7/+22
| | | | | | | | | | | | | | | | A simpler sprite image element for the simple usecase. Because sometimes an engine with stochastic capabilities is overkill. Change-Id: I2b76c5d417719e92a548f6266bffd563dc016983 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Examples refactor rebaseAlan Alpert2012-02-285-1/+0
| | | | | | | | | | | | | | | | Automatic rebase did not move some new files to where they should have gone. Change-Id: I25515d29d8992acde15db0df1bb5972e35573e60 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Start of examples refactorAlan Alpert2012-02-24891-1255/+1291
| | | | | | | | | | | | | | | | | | | | | | | | This is the general reorg of the examples directory structure, plus additional guidelines. calculator, animations and accessibility have been updated to the new standards and tested, as an example. Task-number: QTBUG-24133 Change-Id: I76c3b86751d3195ba2a5474ff23afb875765e9a4 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Use new plugin system in QtDeclarative.Friedemann Kleint2012-02-2316-12/+22
| | | | | | | | | | | | | | | | - Use prefix "org.qt-project" for interfaces. - Use new macros, add json files. Change-Id: I53df83f95153c5c9c462098584606284470a5ae0 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-24911-473/+473
|/ | | | | | | | | | | | | Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* clean up qmake-generated projectOswald Buddenhagen2012-02-2216-80/+9
| | | | | | | | remove "header" and assignmets which are defaults or bogus Change-Id: I1d777f5418b0f353bf276a979c6300a941927e7e Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Alter Clocks demoAlan Alpert2012-02-153-57/+105
| | | | | | | | For further component reuse, it's now a delegate in a view that can load many more clocks. Also looks better both in landscape and portrait mode. Change-Id: Ib5f172ee165554dfbe1ab84b96fe0eec7c22b1d1 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Doc: Overhaul of doc/src/declarative and QtQuick2 docs.Jerome Pasion2012-02-1410-49/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | -Consolidated model/view documentation into one. -Added a new navigation for all overviews (grouped the pages) -New front page that shows the grouping -Separated the Qt C++ from the main QML overviews -Consolidated Qt C++ into the "declarative runtime" section -New articles about JavaScript, the engine, and plugins -Fixed the older examples. New snippet comments -Renamed some of the articles -kept the qtquick2 qmlmodule -"Qt Quick Elements" Moved contents of doc/src/declarative into respective module dirs. -Qt Quick 2, LocalStorage, Particles, and QML are now separate. -Removed unused or duplicate documentation. -edited C++ examples -removed navigation and "\inqmlmodule QtQuick 2" for those pages that are not in Qt Quick 2 -fixed doc/src/ licenses to header.FDL from qtbase Change-Id: Ib36f9c07565d91160fa8d04f9670c438f684b82a Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Remove missing image referenceAlan Alpert2012-02-141-1/+0
| | | | | | | Not really needed for this example anyways Change-Id: I98fd546441f3fd5e6caa9212cc171dab3000a139 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* modify 'mousearea-example' to run with MANY MORE buttonsRick Stockton2012-02-131-13/+77
| | | | | | | | | | | | | The example formerly supported only 'Qt::LeftButton' and 'Qt::RightButton'. This enhancement shows that qml can work with any of the buttons supported by Qt itself. (The example reacts to ALL 27 possible Qt mouse buttons.) Task-number: QTBUG-24132 Change-Id: Id1c1431175c39eace43e48915a47da8c4f92a1b6 Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove non-standard canvas filter/mirror functionsCharles Yin2012-02-131-83/+0
| | | | | | | | | They are not standard context 2d APIs, and now the same effects can be implemented by the ShaderEffect/QtGraphicEffects as well, so remove them from canvas 2d to reduce the duplicated features. Change-Id: If77ea6794e839a59927a313702aeea2282384844 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Use only standard API in examples.Justin McPherson2012-02-109-16/+25
| | | | | Change-Id: I62a864de35c5b595ffda4397edb16342f54a86ce Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Refactor Canvas rendering paths.Justin McPherson2012-02-1010-16/+16
| | | | | | | Refactor Canvas rendering paths to enable different drawing contexts. Change-Id: If0e00a14baa673fca6b999a787b4e89885bb1e51 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>