aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-0330-40/+40
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2130-39/+39
| | | | | | | | | | | | 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-3018-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-304-6/+7
| | | | | | | | | | | | | | | | 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-0411-13/+108
| |\ \ \ | | | | | | | | | | | | | | | refs/staging/dev
| | * \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-2511-13/+108
| | |\ \ \ | | | | |/ | | | |/| | | | | | 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-079-10/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-209-6/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Fixed build when Qt is configured with -no-opengl.Samuel Rødal2013-02-202-7/+6
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28849 Change-Id: I331ebca76892ce7ffbc6f8e03ff4afe0c8e28d5e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | | Fix extending example.Gunnar Sletta2013-02-128-15/+14
| |_|/ |/| | | | | | | | | | | | | | | | | | | | The antialiasing was broken due to wrong flag being used and that the bounds were outside the texture and chapter 5 and 6 did not compile. Change-Id: Ib7c4d8c276a3cc5583ff794e10ff539720857e0c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Add next.png to shared qrc filesAlan Alpert2013-02-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the executable versions of the examples print errors instead of loading it. Change-Id: I7d370ce3ee172491c004668847cdb6d5967f2b24 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | | Merge branch 'release' into stableSergio Ahumada2013-01-316-10/+28
|\ \ \ | |_|/ |/| | | | | Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5
| * | Doc: corrected path to snippetNico Vertriest2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added "quick" to path in imageparticle.qdoc Task-number: QTBUG-29101 Change-Id: If328cde08f46b720defa1953916753ba9d9836a8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | fix qmltest example install pathOswald Buddenhagen2013-01-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I267155bb34b8226331fc2951521dc7b8643a014c Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | mark forgotten EXAMPLE_FILESOswald Buddenhagen2013-01-282-0/+6
| | | | | | | | | | | | | | | Change-Id: I83c7706479ea3afd45ab9c97f63f68d416b28f55 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | fix installation of qmltestcase exampleOswald Buddenhagen2013-01-281-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | split the project along the built-as-part-of-qt line: in qt, it must comply with the installation rules for examples, and it shouldn't be an actual test case - our CI is not supposed to run it ... the stand-alone build (which users are supposed to make use of) needed adding TESTDATA for proper installation. Change-Id: I1bbf7b1204410c5eb8755477310bb023e8f87623 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | Remove outdated macro usageChristian Stenger2013-01-242-4/+1
| | | | | | | | | | | | | | | | | | Change-Id: I4b58f3d74d7dec9a95a07b907c500990630e7762 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | | Clean up accessibility QtQuick exampleTopi Reinio2013-01-214-20/+29
| |/ |/| | | | | | | | | | | | | | | Remove an undefined value (column.h) used in the accessibility example and fix minor indentation and style issues. Task-number: QTBUG-29225 Change-Id: I118ca7ee4fd24a3e94eb9b39e60514314ddcd7f0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Improve the look and feel of our demo launcherJens Bache-Wiig2013-01-175-14/+123
| | | | | | | | | | | | | | | | | | | | | | The existing demo launcher looks rather ugly. This does some visual tweaks to make it look better, including adding support for proper text wrapping. It was approved by our design lead Diana. Change-Id: I660764575a411f598c53c9c42e290a807e20c0cf Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Doc: correcting typo "the the"Nico Vertriest2013-01-142-25/+25
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28756 Spurious repetition of the definite article Doc: corrected trailing space issue. Change-Id: I95c1c5773dc4b25dd0a3625343a67975783435fd Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | Update copyright year in Digia's license headersSergio Ahumada2013-01-10554-554/+554
| | | | | | | | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | make use of qtHaveModule()Oswald Buddenhagen2013-01-101-1/+1
| | | | | | | | | | | | | | Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Doc: Updated docs for examples and etcXingtao Zhang2013-01-0912-64/+71
|/ | | | | | | | | | | | - Corrected several \snippet paths and \example paths. - Added missing example images. - Marked several commands as code. - Updated the exampledirs variable for qtqml. Done-with: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Task-number: QTBUG-28898 Change-Id: I24aac17821f54de4bd5129c45b5bf96dc0f114b2 Reviewed-by: Liang Qi <liang.qi@digia.com>