aboutsummaryrefslogtreecommitdiffstats
path: root/examples/qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-202-0/+0
|\ | | | | | | Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25
| * Doc: Moved all content in the doc directory.Venugopal Shivashankar2012-11-082-0/+0
| | | | | | | | | | | | | | | | | | - 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-0914-30/+30
|/ | | | | | | | 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>
* Changed the plugin module nameVenugopal Shivashankar2012-10-2912-23/+56
| | | | | | | | | | The earlier name, com.nokia.TimeExample is irrelevant now. Also updated all instances of documentation where this older module name was referred. Change-Id: Ic252d0e72af23c2d39d5fed55f242e47c1b6bde9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2388-552/+552
| | | | | | | 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-216-44/+121
| | | | | | | | | -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>
* Use the Module Identifier Directive to make the TimeExample correctLaszlo Papp2012-09-181-0/+1
| | | | | | | | | | | | | | | | From the documentation: "Declares the module identifier of the module. The <ModuleIdentifier> is the (dotted URI notation) identifier for the module, which must match the module's install path. The module identifier directive must be the first line of the file. Exactly one module identifier directive may exist in the qmldir file." More information can be found here: Task-number: QTBUG-26551 Change-Id: Ifd2a7e9a2868ac05baed0dbde9638ce85ff5004a Reviewed-by: Matthew Vogt <mattvogt2@gmail.com>
* Update usage of smooth and antialiasing.Michael Brasser2012-08-284-5/+2
| | | | | | Change-Id: Icc8b28bdd466389ed3f269f076f1bdb6e9abe3f2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* More consistent examples directory structureAlan Alpert2012-08-10117-28/+6
| | | | | | | | 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>
* Restore QML/C++ extensions tutorial and fix plugin docs and examplesBea Lam2012-08-071-2/+0
| | | | | | | | | | | | | | | | | This restores the "Writing QML Extensions with C++" tutorial that was removed during the recent QML doc restructure. This also updates outdated docs in "Creating C++ Plugins for QML" that referred to the use of Q_EXPORT_PLUGIN2() and such as the process for writing QML plugins in Qt 5 has changed. Note the plugins.json line was removed from examples/qml/cppextensions/plugins/plugins.pro since this json file was removed in a previous commit, as plugins no longer require the empty json file. Change-Id: I795d6faf6a741466a952feb8e15b028ec3d52b69 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Empty JSON files are not needed for the plugin systemAlan Alpert2012-07-254-4/+2
| | | | | Change-Id: I8df57ed1ced8128723d790c30c00ccaba0a2787d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Install examples to example hierarchyroot2012-06-221-3/+3
| | | | | | | | 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>
* Fix binding errors in cppextensions examples.Andrew den Exter2012-06-205-1/+6
| | | | | | | | | Import QtQuick 2.0 for value type support in the examples which use QColor. Task-number: QTBUG-26207 Change-Id: I1a477f7b9ff90862d64e2d5545171728c6f97aaa Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Allow qtdeclarative to compile with -no-widgetsMartin Jones2012-06-051-1/+2
| | | | | | | | We have no hard requirement for QtWidgets library, so we should build without it. Change-Id: I85c85cc1a52bf9daa7ab7916f19bf7cc3ad5845f Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
* Remove QJS exception APIKent Hansen2012-05-031-1/+1
| | | | | | | | | | | | | | | | | This API has been deprecated for a while. It's legacy stuff from QtScript. Until someone proves that QJSValue::isError() isn't sufficient to handle JavaScript exceptions, we won't provide any additional API for that. Also removed QJSValuePrivate::lessThan(), which was using the exception mechanism, but the function itself wasn't used anymore (another remnant from the QtScript days). Change-Id: I3dffc6a7835874153f90d25ae2a72c93ea6db39a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-04-114-53/+55
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Tidy up examples documentationAlan Alpert2012-03-282-17/+30
| | | | | | | | | | | | | | | | | | 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-283-36/+25
| | | | | | | | | | | | | | | | | | | | | | -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>
* | 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>
* Refactor XMLHttpRequest example.Charles Yin2012-03-135-0/+132
| | | | | Change-Id: I4fd4fa4fb190814e1e32ce847d05ab0015ad4ca0 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix renaming merge with examplesAlan Alpert2012-03-06715-40264/+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-0533-55/+793
|\ | | | | | | Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
| * Move some toys back to examplesAlan Alpert2012-02-2815-0/+669
| | | | | | | | | | | | | | | | | | 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>
| * Examples refactor rebaseAlan Alpert2012-02-282-0/+2
| | | | | | | | | | | | | | | | 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-24124-0/+6905
| | | | | | | | | | | | 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>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-24837-0/+47102
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>