aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix some broken snippet pathsSze Howe Koh2013-05-0619-123/+123
| | | | | Change-Id: Ib79bfbea402b86e26a503de47383522317ca906b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Make the titles of example pages consistentSze Howe Koh2013-05-065-6/+6
| | | | | | | | | | Most of the example titles have either a "Qt Quick Examples -" prefix or a "Scene Graph -" prefix. Also fixed a typo ("Scenegraph" -> "Scene Graph") Change-Id: Ibeb25d88d1888be3fb004a9ad95dc7ccbfeed7e3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Move full apps from "qtquickexamples" to "qtquickdemos"Sze Howe Koh2013-05-064-10/+8
| | | | | | | | | | | | | "qtquickexamples" is for illustrating code usage; "qtquickdemos" is for showcasing fully-functional apps. Renamed titles and screenshots to match the other demos. Also, attempt to make the descriptions sound more interesting. Change-Id: I2fb43c5d32f24159cd39564576d4ebd76b2cbeaa Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add new Item.Screen properties to screenInfo exampleShawn Rutledge2013-05-041-34/+35
| | | | | | | | Also removed the rotation animation which doesn't seem useful. (On most platforms the content will auto-rotate anyway.) Change-Id: Ia6ca1046fc2162a13be5c26cbf5d2b698ffa2367 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Doc: Move example docs related to QtQml under the correct moduleTopi Reinio2013-05-0340-2561/+0
| | | | | | | | | | | This change moves 'Extending QML' qdoc file and the tutorials from examples/quick to examples/qml, which is the correct location for them. Change-Id: I24bd9dfa75baaab7bc8efe08489f09a7b65d98a6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Better handle GL errors in EtcTexture::bind().Michael Brasser2013-05-031-0/+6
| | | | | | | | | The scenegraph as a whole does not typically do GL error checking. That means GL errors occurring elsewhere could cause the etcprovider to unload textures that loaded correctly. Change-Id: Ic8e0caa62dab50b391e226cf0a493bc7e357dc46 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Canvas: Do not apply transform to text twiceFrederik Gladhorn2013-05-031-3/+2
| | | | | | | | | | The path already has the transform, no need to apply it a second time manually. Task-number: QTBUG-30501 Change-Id: Iedcb2e2f85a1f9eeac8e6264e00536c43bf16ddb Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix MaskedMouseArea exampleFrederik Gladhorn2013-04-301-2/+2
| | | | | | | Task-number: QTBUG-30916 Change-Id: Icc73118f8d129b6c1ef285fd7a35f7a9a8e04391 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Doc: Fix example path for Qt Quick scenegraph examplesTopi Reinio2013-04-292-2/+2
| | | | | | | | Base path (examples/quick) is now defined in qdocconf file, example docs need to adjust their paths for \example command. Change-Id: I18412c4adf73691903ee58c9a056b6a4998d4d6a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Remove "qmldemos" groupSze Howe Koh2013-04-291-1/+1
| | | | | | | | | The group is a remnant of Qt Quick 1, and currently only contains 1 member. Move it to the "qtquickexamples" group. Change-Id: I211b9b769274e139321760f4b52220449e03a6ad Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Re-implemented itemChange must always call QQuickItem::itemChangeShawn Rutledge2013-04-263-14/+9
| | | | | | | | | | Documentation for that fact, and the windowChanged signal. Fix existing QQuickItem subclasses which didn't call QQuickItem::itemChange. Examples should rather connect to the windowChanged() signal. Change-Id: Ieddcdbe69f849ddb120b64be9c5e0a21393b0ed9 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Quote scenegraph example code from the right place.Gunnar Sletta2013-04-263-42/+42
| | | | | | Change-Id: I0eced5b0062aa36dc67b575615ed4c82d3ea6d3d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Doc: Qt Quick: Fix module name format (Pt 1/2)Sze Howe Koh2013-04-234-5/+5
| | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Attempt to differentiate between the whole module ("Qt Quick") and the QML import ("QtQuick") by encoding the latter with monospace font. There are places in the text where both representations are valid. Change-Id: Id6e157a4191aaa4e23a9cd5c76abfe902fe43d33 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Create BG context and fake surface on GUI threadGunnar Sletta2013-04-233-22/+85
| | | | | | | | | | | This makes the example more messy and also makes it very hard to avoid the initial black frame, but it is not compliant with the limitations we experience on Windows. Task-number: QTBUG-30077 Change-Id: If5a6da16f8fc1269cd20d2aa1190588025203d4f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Version new property and signalLiang Qi2013-04-087-7/+7
| | | | | | | | activeFocusOnTab and activeFocusOnTabChanged in QQuickItem. Task-number: QTBUG-30446 Change-Id: I973df95d690b8e533b5cc108d8e083a2fed8528a Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-0326-36/+36
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc examples/quick/accessibility/doc/src/accessibility.qdoc examples/quick/animation/doc/src/animation.qdoc examples/quick/canvas/doc/src/canvas.qdoc examples/quick/draganddrop/doc/src/draganddrop.qdoc examples/quick/imageelements/doc/src/imageelements.qdoc examples/quick/keyinteraction/doc/src/keyinteraction.qdoc examples/quick/localstorage/doc/src/localstorage.qdoc examples/quick/mousearea/doc/src/mousearea.qdoc examples/quick/particles/affectors/doc/src/affectors.qdoc examples/quick/particles/customparticle/doc/src/customparticle.qdoc examples/quick/particles/emitters/doc/src/emitters.qdoc examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc examples/quick/particles/system/doc/src/system.qdoc examples/quick/positioners/doc/src/positioners.qdoc examples/quick/righttoleft/doc/src/righttoleft.qdoc examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc examples/quick/threading/doc/src/threading.qdoc examples/quick/touchinteraction/doc/src/touchinteraction.qdoc examples/quick/views/doc/src/views.qdoc Change-Id: Idf7bb76c82acacf86b19a9f4633c3cbf4ae1a9a0
| * Doc: Spelling fix.v5.0.2Jerome Pasion2013-03-261-2/+1
| | | | | | | | | | | | | | "sufficent" -> "sufficient" Change-Id: Id46e15c3fb0a2514e8a391108065a52a18da6936 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Fix duplicate examples for qml/quick modulesKai Koehne2013-03-2126-35/+35
| | | | | | | | | | | | Task-number: QTBUG-30233 Change-Id: Ic0a6d9112dbf8903d68f571e0ac853d89ff31ebe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix incorrect merge in textureprovider example.Michael Brasser2013-04-021-1/+0
| | | | | | | | | | | | Change-Id: I5a76ab1ef77c43aecd2a03cc7d614a198290f427 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Update EtcProvider example to support configurable base url.Michael Brasser2013-04-023-4/+22
| | | | | | | | | | Change-Id: Idb047bc7bf2c9f1c62c4749cb416bdf267e66e17 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Doc: Fix some titles and linksSze Howe Koh2013-03-3017-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make page titles follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation. Make class/type list titles follow the "<Qt Module> C++ Classes" and "<Qt Module> QML Types" formats. Links are updated accordingly, along with broken links found during this sweep. Some inline links also have their surrounding text modified, to improve flow. Change-Id: I0ed7788caa250085d7ea0080a77d8a2655debf39 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Doc: Update module "Qt Declarative" -> "Qt Quick"Sze Howe Koh2013-03-303-3/+3
| | | | | | | | | | | | | | | | Also update examples/README to show the relationship between Qt Quick and Qt QML. Change-Id: I4e50d9f0ddb1ac25ccdfed09f579f76a375b14fe Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Doc: Fixed some uses of terminolgies in qdoc files.Jerome Pasion2013-03-2619-63/+51
| | | | | | | | | | | | | | | | | | | | | | -"element" -> "type" or "object" (not in all cases where this change applies) -some instances of QtQuick. It should be "Qt Quick". -only in qdoc files. Examples and source code changes will be done later. Task-number: QTBUG-30180 Change-Id: Ie587461a138e97606f761ad1e90909c91b479303 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge branch 'dev' into stableSergio Ahumada2013-03-20103-1010/+3405
|\ \ | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
| * | Remove duplicated docsAlan Alpert2013-03-181-73/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the move of docs to a separate file, this copy of docs seemed to be resurrected by mistake. Removing it and properly formatting the code. Change-Id: Id7257c232880a8829e8864af12c5b7b5c484a398 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * | Add ColorDialog to QtQuick.DialogsShawn Rutledge2013-03-181-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | As with FileDialog, it tries QPA, then QColorDialog, and falls back to a QML implementation (which is also provided here) if neither type of native dialog is available. Change-Id: I384928e1f7322bb6b867d4618d07c88c70e3cbfe Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | Fixed invalid GLSL in openglunderqml example.Samuel Rødal2013-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | First argument to pow is not allowed to be negative. Task-number: QTBUG-30191 Change-Id: Iac6c25d84e26777564d6741690aab552a0bb513e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | 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>
| * | Cosmetic changes in common controls for examplesShawn Rutledge2013-03-149-198/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use system palette colors. SimpleLauncherDelegate has its own "button" rather than using the shared one, which really wasn't suitable for any other purpose. So now example apps can use Button, and ToolButton isn't necessary. Change-Id: I632397f36b96a26c32a86301ddacb85d5c3221f0 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
| * | | Add QtQml.Models moduleAlan Alpert2013-03-1221-57/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Support activeFocusOnTab in QQuickItemLiang Qi2013-03-124-12/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add activeFocusOnTab as property to QQuickItem. Setting the property allows automatic keyboard navigation between all elements that have it set. This key event handler will only be called after the QML key handlers, such as KeyNavigation and Keys, and the C++ key event handlers, such as keyPressEvent function. Algorithm is most done by Frederik Gladhorn, in cooperation with Gabriel de Dietrich. Done-with: Frederik Gladhorn <frederik.gladhorn@digia.com> Done-with: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Change-Id: I8b58be9c20d113661fe85d27bdb1af84340d9de5 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | | Mark geometry dirty to signal scene graph that a repaint is needed.Gunnar Sletta2013-03-112-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic230ffe43b690e3f1e0e7290c4c9571f60bd34b7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | | Fix relative URL in parallax exampleAlan Alpert2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Samegame demo moved a while back, this didn't get updated. Change-Id: Ib34a09f606528e1e53650bbbd4d19787b1864bcb Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@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>
| * | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-03-047-6/+70
| |\ \ \ | | | | | | | | | | | | | | | refs/staging/dev
| | * \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-257-6/+70
| | |\ \ \ | | | | |/ | | | |/| | | | | | Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41
| * | | | adding QtQuick.Dialogs, with FileDialog implementationShawn Rutledge2013-03-046-0/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will obsolete the QFileDialogItem in desktop components and be available to all QtQuick applications. The QML FileDialog type is dynamically defined in the plugin by detecting which implementation will work on the current platform. Change-Id: I073c7a84bff6c02cf592dc46822a5a4b9c9bcaea Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | | | Added examples on how to use FBOs with scene graph.Gunnar Sletta2013-03-0322-5/+1348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I also cleaned up the naming of the other scene graph examples a bit, so that they sort together in the samples list and have a more obvious naming scheme. Task-number: QTBUG-29548 Change-Id: I455eacb02c06058a6d49e12e4f1813ec80b655f6 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * | | | Various improvements to Canvas examplesJens Bache-Wiig2013-02-2628-1020/+623
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed these examples were rather "aestetically challenged" and decided to make it a test case for our WIP style guidelines. - Use consistent margins (12 px) - Use proposed color palettes - Use proposed fonts and header styles I created a new Slider graphic and moved this into the shared folder as I think it is useful for other examples. I removed a lot of unused files which seem to have been added but never actually used. I also found several bugs in our implementation, including not scaling or rotation around the correct origin. In many cases I simplified the examples, removing variables/sliders where they did not add significantly to the example itself. Change-Id: Ie09da33deaf56a3ec45a2031b87a24a8602e994a Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-188-15/+14
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I33db683ebf12248b2ed14eeaf65c4bcade14bfbf
| * | | | Ensure EtcTexture always provides a valid textureId.Michael Brasser2013-02-152-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e7e8095593838f0fc1d78d1cb5a146787f748a7 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-078-5/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quick/textureprovider/etcprovider.h src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf tests/auto/quick/qquickflickable/tst_qquickflickable.cpp Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4
| * | | | | Add ETC1 texture provider example.Michael Brasser2013-02-029-0/+464
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was removed as a labs import in commit 732a86a11dbc20079e33c289af72762ce0125ced. Bring it back as an example. Change-Id: I057d721117dc75256c4a7229c4f8fad8dc9ac6b2 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | | | | Added an example of the window container embedding a QQuickViewGunnar Sletta2013-01-256-0/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I451716f4a0eac2020835a9e8a0d67626b981c736 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-234-20/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952
| * | | | | | Fix import path of TextBallon-example.Friedemann Kleint2013-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28144 Change-Id: Ic20fa242137a08e43b0685ebe701def929028647 Reviewed-by: Jerome Pasion <jerome.pasion@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>
* | | | | | Fixed tutorial gettingStartedQml part5.Libor Tomsik2013-03-131-5/+5
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In FileDialog.qml the selector GridView.view.currentIndex does not work, replaced with dirView.currentIndex Change-Id: I7c1893ce3872c41fc4f0fd63bad0e6a2cff2b207 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | | Doc: Fix paths and add missing project files for QML and Quick examplesTopi Reinio2013-02-207-6/+70
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 06:37:07 +0000