aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Update imports and module documentationChris Adams2012-08-084-3/+4
| | | | | | | | | | | | | | | | | | Recently, the qmldir syntax was modified to allow a module identifier directive to be specified. This allows us to guarantee that types provided in that namespace are not overridden by other modules. Given this fundamental change, the documentation needed to be updated to reflect the new terminology surrounding imports: - modules - identified vs legacy - directories - local and remote directory imports - JavaScript resources - scripts which can be imported directly Change-Id: I5a3d38de93d0186e79b87f2b3050f2b802088348 Reviewed-by: Bea Lam <bea.lam@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>
* 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-2510-10/+5
| | | | | Change-Id: I8df57ed1ced8128723d790c30c00ccaba0a2787d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Clean up StocQt demoAlan Alpert2012-07-2422-1/+107
| | | | | | | | Rename, add cpp shell, add doc file, add project files. Task-number: QTBUG-26235 Change-Id: I51c2abefbadbadbadae0abdde5a52f857bcdb68b Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* TweetSearch Stylistic TweaksAlan Alpert2012-07-245-15/+35
| | | | | | | Includes upgrading the bird sprite to stochastic behavior Change-Id: I6357f6a47ded0a18ad0746c3eef590ee9092db52 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Particle example restylingAlan Alpert2012-07-249-640/+604
| | | | | | | | | For self-contained particle systems, placing them inside the ParticleSystem element is encouraged. Change-Id: Iafc5a94bb07c4c0dac0daec300d01e0fde165146 Reviewed-by: Yann Bodson <yann.bodson@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Cleanup/simplify tweetsearch exampleYann Bodson2012-07-236-75/+69
| | | | | | | | Also make it possible to click on links Change-Id: I51c2abef12662f415ae0abdde5a52f857bcdb68b Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Rewrite stockchart demoCharles Yin2012-07-1727-1362/+1112
| | | | | Change-Id: Ie931d116f3ac16245d56b8c1539e5c4f2dc490f0 Reviewed-by: Yunqiao Yin <charles.yin@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>
* Add maroon demoAlan Alpert2012-07-1272-1/+2106
| | | | | Change-Id: I880edf78e210d243ef87511e88ea592f6e252da6 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add new samegame and calculator demosAlan Alpert2012-07-12107-802/+2598
| | | | | Change-Id: I06ac38a1d0f844eba367fc5e163151d1f70a0012 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update particles examples en masseAlan Alpert2012-06-2939-94/+847
| | | | | Change-Id: I882f59c687d790bc55cf59abf6f0ea80b65b50d9 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Rename speed -> velocity in the particle systemAlan Alpert2012-06-2931-72/+72
| | | | | | | | 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>
* Merge branch 'buildsystem'Oswald Buddenhagen2012-06-262-5/+10
|\ | | | | | | Change-Id: I230e776290761be7c811c3aec4d915367012fc99
| * 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>
| * remove pointless qmltest conditionalsOswald Buddenhagen2012-06-261-2/+10
| | | | | | | | | | | | | | | | it is a module within this repository, and consequently the flag is always set. Change-Id: I8ffdd6903b1b0835725b824a9deb961d0124ce11 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* | Rename ListView *speed properties to *velocityBea Lam2012-06-261-1/+1
| | | | | | | | | | Change-Id: I63c02d186b1832e7bf890a00caad150d5bf136cb Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | Revert "Remove properties related to highlight speed"Bea Lam2012-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 18fb5506d524dbe380d5bf636c74c93fb85cbc31. Without these properties there's no way to set a constant movement speed. Change-Id: I49cd648846f801eb479ecce8cde09ff49ea11736 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | Delay custom emitter processingAlan Alpert2012-06-251-3/+5
|/ | | | | | | | It now happens after ParticlePainter intialization, so that custom emitters can affect painter specific parameters like color. Change-Id: I9a732713108580e57130588c175c69aa854c5b2f Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Remove stale demosAlan Alpert2012-06-22112-6416/+0
| | | | | | | Focus for Qt5 is fewer, better demos. Change-Id: Ia2b74ce4768034d8f225547ffbbc85ac5cb72845 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Install examples to example hierarchyroot2012-06-2210-22/+22
| | | | | | | | 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>
* Remove properties related to highlight speedBea Lam2012-06-221-1/+1
| | | | | | | | | | ListView should only have duration-type properties (i.e. highlightMoveDuration and highlightResizeDuration) as it's unnecessary to have both duration and speed properties for the highlight animation. (PathView and GridView only have the duration-related properties.) Change-Id: I1b94599e3e89afe6488ce2a882c2802354a859fe 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>
* Fix snake demo.Martin Jones2012-06-221-2/+1
| | | | | | | | A surrounding Item {} appeared for no clear reason. Task-number: QTBUG-26198 Change-Id: I1ddb7cc92c5ba977d85d3047c405a90cfe697a13 Reviewed-by: Yunqiao Yin <charles.yin@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>
* Give the example Loader in the shared launcher focus.Andrew den Exter2012-06-201-4/+9
| | | | | | | | Allows an example to receive focus the same as if it were the root item in a scene. Change-Id: Iedd31236db50ba985aebe3bd82a5af8803dc0f17 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix missing content in installed calculator demo.Andrew den Exter2012-06-201-1/+1
| | | | | | | | Add the content directory to the project installs. Task-number: QTBUG-26203 Change-Id: I08b79534f522024b289724ebaba206715b8bfbea Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Resolve example qml file paths relative to the executable path.Andrew den Exter2012-06-201-1/+1
| | | | | | Task-number: QTBUG-26202 Change-Id: I0ef9d2aa2248c8ddfd61afcd8bca731325f8d239 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix compile of Same Game demo.Andrew den Exter2012-06-202-1/+2
| | | | | | Task-number: QTBUG-26204 Change-Id: I79059969033c57f82437bbec4e4323bfa0cc9430 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove particles examples launcherAlan Alpert2012-06-0841-275/+0
| | | | | | | New examples guidelines include its own launcher scheme. Change-Id: I93f2ef40ba2b9344e9e3074ef31d7b6d2aed72b1 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Update Affector folder of examples to guidelinesAlan Alpert2012-06-0815-82/+317
| | | | | Change-Id: I1fa0e8424f94cf954098b7734ba25feab0790828 Reviewed-by: Bea Lam <bea.lam@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>
* Replace twitter demo with new tweetsearch demoYann Bodson2012-06-0142-995/+1168
| | | | | Change-Id: I1b4433e63184cb773056bb753011d6320254cd52 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix doc snippets paths and parsing errorsBea Lam2012-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtqml.qdocconf and qtquick.qdocconf now refer to the correct snippets and source directories. Snippet paths in .qdoc and .cpp files have been updated to refer to the new shortened path references, e.g. \snippet qml/file.cpp instead of \snippet doc/src/snippets/qml/file.cpp. This also deletes snippets from src/qml/doc/snippets that belonged under src/quick/doc/snippets (and were already duplicated there anyway) and restores some snippet files that shouldn't have been deleted. Also fixes some inline snippets to use \code .. \endcode instead of \qml .. \endqml as they contained javascript or partial QML snippets that were causing parsing errors from qdoc. There are still snippet errors arising from qmlintro.qdoc as the qmlintro snippets directory that it refers to cannot be located. There are also two references to a removed snippet identifier in examples/qml/cppextensions/plugins/plugin.cpp that need to be fixed in conjunction with the related docs in a later commit as the relevant code has changed and the docs are now invalid. Task-number: QTBUG-25721 Change-Id: I50c665245a74c140470c58a32546591d187dfe4b Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Examples cleanupAlan Alpert2012-05-2222-408/+476
| | | | | | | | | Rename calculator/CalculatorCore to calculator/content for consistency. Also fix license headers in calculator and samegame to be the examples license instead of the source license. Change-Id: Ia2254fcd7cce1114199921ede91bf8f032058f77 Reviewed-by: Martin Jones <martin.jones@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>
* 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>
* 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>
* Disambiguate qmltest example and qmltest autotest.Jason McDonald2012-04-241-1/+1
| | | | | | | | Give the example a different name so that CI logs are not so confusing. Task-number: QTBUG-25306 Change-Id: Iafa06790ced42656217f3478b6398b3b4fd1c8bd Reviewed-by: Yunqiao Yin <charles.yin@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>