aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* PinchArea: handle smart zoom gestureShawn Rutledge2015-02-131-1/+20
| | | | | | | This is the double-finger double-tap trackpad gesture on OS X. Change-Id: Ie79dc533adf382170867318bc9b61b367f819e9b Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-12610-3175/+3175
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Photosurface example: flickable surfaceShawn Rutledge2015-02-121-61/+107
| | | | | | | | | | | | | | The Flickable provides a way of testing interaction with 2-finger trackpad gestures: if the cursor is over the background, you can flick the surface via wheel events (which come from native flick gestures if you are using a trackpad on OS X); inside the bounds of a photo, the same 2-finger gesture is for zooming and rotating. Also, random position and rotation are applied more correctly, and only at startup. Position and rotation changes are animated. Change-Id: Iab49b7f2e99a9686424368fd94f0b7f89807da22 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* QQuickItemParticle: Only delete owned particlesAlan Alpert2015-02-041-0/+4
| | | | | | | | | | | | | | | | | A common pattern for ItemParticle (as shown in the particleview.qml example) is to use it to manage movement of a model's delegates. In such a case item management is handled by the user code (which bridges the needs of the Model and the View) and deleting the items in ItemParticle quickly leads to crashes. This change maintains (and improves, due to handling resets) the deletion of delegates created by the ItemParticles, as shown in delegates.qml. This example was expanded with a click to reset feature so as to more clearly see the impact of resets. Task-number: QTBUG-37486 Change-Id: I9de935034c11a7dd2abdd60e7b3bd42867dede9c Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Fix ItemParticle ExampleAlan Alpert2015-01-261-5/+3
| | | | | | | | The "press space to inject new items" functionality was broken, it had missed a couple of API changes somehow. Change-Id: Idccbf7ef50ecf5fc9d296a472f1dd78669f94206 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2015-01-162-3/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/qml/jsruntime/qv4context_p.h src/qml/jsruntime/qv4debugging.cpp src/qml/jsruntime/qv4engine.cpp src/qml/jsruntime/qv4functionobject_p.h src/qml/jsruntime/qv4qobjectwrapper.cpp src/quick/scenegraph/shaders/visualization.frag tests/auto/qml/qjsengine/tst_qjsengine.cpp Change-Id: I492e8546c278f80a300a2129e9a29d861e144a30
| * Fix compile issue with -opengl dynamic on WindowsAndy Shaw2014-12-181-3/+5
| | | | | | | | | | Change-Id: I2b17482c0e8d04718e91b9772784afce4ebdc101 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * rendercontrol example: calculate fbo size correctlyLaszlo Agocs2014-12-171-1/+1
| | | | | | | | | | | | | | Take device pixel ratio into account. Change-Id: I729d562ad9523e11ee304136f668f496d4e00f37 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| * Restore extension types documentationAlejandro Exojo2014-12-101-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation on QML extension types was accidentally removed on the big restructuring of commit 28def0bdd084989c17a157e0c4ab80c259081caa. This restores it to a section on the "Defining QML Types from C++" page mostly unchanged, and makes the source of the example that was already there visible. The reference documentation of the qmlRegisterExtendedType is added as well, and the one for qmlRegisterExtendedUncreatableType and qmlRegisterCustomExtendedType that was added in fcb40ff6d71f4561401e6b2bd4d7fc706fff8eee is now fixed. It was not being generated because referred to "QQmlEgine" instead of "QQmlEngine". Change-Id: I1403b10076c64a4c0d760f72b06dd52c38b351a5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Prevent windows outside the gui thread in rendercontrol exampleLaszlo Agocs2015-01-074-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the multithreaded case we attempted to create QWindows outside the gui thread on platforms where QOffscreenSurface is backed by the hidden QWindow in the absence of a better solution. This has to be avoided. Therefore, pass a suitable surface from the gui thread instead. This will avoid "Attempting to create QWindow-based QOffscreenSurface outside the gui thread." type of warnings when running on OS X with --threaded. Change-Id: Ie3ebeeeaa9e6bdf83e763e40213e2940fbfde667 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
* | Photosurface example: scale and rotate the frame, not the imageShawn Rutledge2014-12-231-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The size of the border around the image could otherwise change dramatically, because the PinchArea was zooming the image. It's conceivable that the frame could follow the image in scale and rotation, but that doesn't work as long as the image is inside the frame, because changing scale and rotation of the parent affects the child too. So it follows that the scale and rotation of the image should never be directly set. This helps the apparent size of the white border around each image to be visually consistent. Another advantage is that the the image centroid doesn't tend to move, so compensation is not necessary. Change-Id: Ib7767e369097b32f006274add73ac544aedaf839 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | rendercontrol example: calculate fbo size correctlyLaszlo Agocs2014-12-181-1/+1
| | | | | | | | | | Change-Id: Ida1e7cb9426d31ed6406dd6db86f5834f0f1a6ac Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
* | rendercontrol example: Add missing flushesLaszlo Agocs2014-12-172-0/+3
| | | | | | | | | | | | | | | | Otherwise we will show broken output with some drivers. QQuickWidget does this already. Change-Id: I5193595c4606d0497dbe85f6f8c670618ca366e9 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
* | Support threading with QQuickRenderControlLaszlo Agocs2014-12-128-201/+938
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize the rendercontrol example to demonstrate both the single and multi threaded approaches. A small helper function is introduced to the QQuickRenderControl API: The QSGRenderContext has to live on the render thread. Previously there was no way for applications to move it to the desired thread. This is now possible. Pass --threaded to the rendercontrol example to use a separate render thread. [ChangeLog][QtQuick] QQuickRenderControl can now be used to render the Qt Quick scene on a dedicated render thread, similarly to how the built-in threaded render loop operates. Task-number: QTBUG-42813 Change-Id: I01c3b2ffca8a174d9d2c267a51f2e484ed7b34b3 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2014-12-098-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4arraydata.cpp src/qml/jsruntime/qv4context_p.h src/qml/jsruntime/qv4globalobject.cpp src/qml/jsruntime/qv4internalclass.cpp src/quick/items/qquicktext_p.h src/quick/items/qquicktextedit_p.h src/quick/items/qquicktextinput_p.h Change-Id: If07e483e03197cb997ef47a9c647a479cdb09f4c
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4Simon Hausmann2014-12-052-4/+4
| |\ | | | | | | | | | Change-Id: I5978bab8a4fde4c2ee33907fd81f49cb69e4fb26
| | * qttest: make findChild available only for QtTest 1.1Fawzi Mohamed2014-12-052-4/+4
| | | | | | | | | | | | | | | Change-Id: I4ceb1a969bd4296b82f899088b02b5e8cf100bcd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | Fix permissions of filesKai Koehne2014-12-025-0/+0
| | | | | | | | | | | | | | | Change-Id: I22958892d846da348325ba608084f8d9a05473d4 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | example, touchinteraction: use forceActiveFocus to gain focusRichard Moe Gustavsen2014-11-131-1/+1
| |/ | | | | | | | | | | | | | | | | | | Use forceActiveFocus to gain focus when the user clicks on a note. Just setting focus on an item is not enough to gain keyboard focus. Change-Id: Ia4a68a17df0df4b321cc6edb646b39c36167e982 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* / Add hint regarding alpha fbo's in the textureinthread example.Gunnar Sletta2014-11-171-0/+2
|/ | | | | | Change-Id: I92e6a7c2ca9e9f229b1fc463feea9f657ae18db9 Task-number: QTBUG-42486 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Revert: use the new form of QTranslator::load() for more flexibilityShawn Rutledge2014-10-281-2/+1
| | | | | | | | | | | | | | | | | | | This reverts commit 427646b8d7c52e5b84240e07ffd391217ce3bfa8. It seems that it should have been more correct, but we are still not shipping English translations, and static QString find_translation() in qtranslator.cpp will return any language which is in QLocale::uiLanguages() for which the translation file is found. That is a long list on OSX. Reverting the patch means find_translation() is not called in such cases. This change can be re-done whenever we are more sure that the attempt to find a translation will succeed in finding a sensible one, or fall back to not translating, rather than choosing a language that the user didn't intend. Task-number: QTBUG-41977 Change-Id: I425946cc71cec96b4f38629eb2b7e80220c5236d Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* Move action handlers to the Accessible attached objectJan Arve Saether2014-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | With this change, instead of writing: function accessiblePressAction() { submit() } You should write: Accessible.onPressAction: { submit() } For the moment, only 4 actions are added: press, toggle, increase and decrease. The old style action handlers are deprecated, and removed from the documentation. New style action handlers will be preferred in case an item declares both styles. Change-Id: I11919e631d8476d55540f94252757b911c44ade4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Screen attached property: expose devicePixelRatio propertyShawn Rutledge2014-10-231-1/+4
| | | | | | | Change-Id: I08b22766b3e389b7d27ca4c56729f550b0647a08 Reviewed-by: Jens Bache-Wiig <jensbw@gmail.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* examples/quick/positioners: Colors changed and layout obeys screen resolutionKari Hautamäki2014-10-143-164/+210
| | | | | Change-Id: I61b6358d6d5dff4cc9a14f8774b1c3597e83b550 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Updated the \brief and detailed descriptionVenu2014-10-091-2/+3
| | | | | | | | | | Just to give a hint to the reader about what the example does. Task-number: QTBUG-37203 Change-Id: Ibb377e4adfb25ed4e4da0a41280e4157fae638ba Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* use the new form of QTranslator::load() for more flexibilityShawn Rutledge2014-10-011-1/+2
| | | | | | | | | | | | | | As the docs explain, the variant of QTranslator::load() taking a const QLocale& is better because it "uses QLocale::uiLanguages() and not simply the locale name, which refers to the formatting of dates and numbers and not necessarily the UI language." And, using a default-constructed QLocale permits QLocale::setDefault() to override the system locale, so for example an application's main.cpp can do that before constructing a QQmlApplicationEngine. Task-number: QTBUG-7329 Change-Id: Ia29a4c894087c92b071c0fe484728866f2660fe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Update the Calqltr demo visuals and engine logicTopi Reinio2014-09-306-52/+181
| | | | | | | | | | | | | | | | - Add logic for displaying the calculation result in the best available precision, determined by the display width - Display 'ERROR' when the result cannot be displayed - Animate the number pad button colors to react to presses and visually disable them when pressing the button has no effect - Fix issues in calculator.js logic - Update documentation accordingly Task-number: QTBUG-41253 Change-Id: Ibed7b8218ea4cd074b8f9b90d9bb4e3ea6b25ba2 Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Doc: Combine the extending QML tutorial chapters into a single exampleTopi Reinio2014-09-3048-6/+6
| | | | | | | | | | | | | Combine the six examples associated with each tutorial chapter into a single, top-level example project 'extending-qml', with subprojects for each of the tutorial chapters. Clean up the docs, add links, and a note about a warning that the user may see when running the code in the first chapter. Task-number: QTBUG-32947 Change-Id: Idba4e2153817ab29f1afaf1947d1f2e25964e7b3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Updated calqlatr demoJohanna Aijala2014-09-254-15/+54
| | | | | | | | | | | | | | | | Fixes and finetuning of calqlatr demo: - fixed text overlapping, changed max length of a number from 14 to 9 - fixed app "freeze" after entering number of maximum length - implemented +/- operator functionality - fixed listview scrolling, after multiple operations listview was scrolling only when entering '=' leaving the active line hidden when the numbers and operator were typed - added support for entering numbers and certain operators from keyboard - removed commented code Task-number: QTBUG-38818 Change-Id: Ic0ecd2dff68a89007421e95a5bdc3ab7ca2e401d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Add docs for Clocks exampleLeena Miettinen2014-09-251-3/+89
| | | | | Change-Id: I626376ae2a169f7d892e86309754633e9ed6a6e9 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix disappearing slider during size/orientation changeAlex Blasche2014-09-244-3/+80
| | | | | | | | | | | | | | Now the slider remains at a position that is equivalent to the old position based on the previous percentage. This change is most commonly triggered during orientation changes on mobile device. That is the reason why the app was converted to a proper Qt project. This way it was possible to test this behavior on Android. Task-number: QTBUG-18423 Change-Id: If05e6a1e42249f90a821c4882021d28cf212fc52 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Doc: apply title case to all section1 titlesNico Vertriest2014-09-245-14/+14
| | | | | | Task-number: QTBUG-41250 Change-Id: I303d989992c9685f73baae50c64accf71b43549f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Updated the example to accept input on AndroidVenu2014-09-231-1/+5
| | | | | | | | | | | | | | The Android inputMethod doesn't commit the text until a word is chosen from the suggestions list. This makes the URL for XMLHTTPRequest invalid. To avoid the invalid URL, we should either not use predictive text or explicitly commit the text. I choose to go with the earlier option. Task-number: QTBUT-41335 Change-Id: Id03c4dc8cfbd1b32cc2868fe8b78cd039994ff71 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Window example: setOrientationUpdateMask to allow all orientationsShawn Rutledge2014-09-221-0/+4
| | | | | | | | The purpose of showing both orientation and primaryOrientation is to see how they both change when the screen is rotated. Change-Id: I54e51c834c568b1dbd895584b9f80e4b00c8d506 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* StocQt example: Display trading volume scale for stock chartsTopi Reinio2014-09-221-3/+21
| | | | | | | | | | | | | | | Similar to how the example already shows scale of the stock price on the right-hand side margin, this change adds a scale for the trading volume. Large volume values are shortened to a more readable format, using symbols for units of thousand/million/billion etc. Task-number: QTBUG-38254 Change-Id: I068bba1622d2a586a5dd14dddd4b832c8b112d2d Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Diana de Sousa <diana.desousa@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Update used colors on basis of the recommended color palette.Tarja Sundqvist2014-09-194-24/+24
| | | | | | | | | | qtdeclarative/examples/quick/animation uses some colors which are not mentioned on the recommended color palette. They are replaced with recommended colors. Task-number: QTBUG-41368 Change-Id: I6f07340735333c5da319fdc59ecf8aa7388ad2a5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: add documentation for Photo Viewer exampleLeena Miettinen2014-09-191-3/+288
| | | | | Change-Id: Iffedd9361bd0475a53c1a8b9567c9cbf5e5d4867 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fixed frame focusing on touch devicesTomi Korpipää2014-09-192-17/+18
| | | | | | | | | | Also fixed the \quotefromfile commands in the doc to display the changed code correctly. Task-number: QTBUG-38779 Change-Id: I37d37139459cb9cdee7ec9beaffeab26a1cb4aaf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Avoid crashing the rendercontrol example on exitLaszlo Agocs2014-09-181-2/+5
| | | | | | Task-number: QTBUG-41278 Change-Id: I456467698e66fb28f1bf6a05d85771ac25f454d0 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Doc: Added a bit more detail about the exampleVenu2014-09-111-2/+47
| | | | | | | Task-number: QTBUG-37203 Change-Id: I62664b5dd0041cf8ba210dc3f0375793f7c72a00 Reviewed-by: Nico Vertriest <nico.vertriest@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Tune the colors in the rendercontrol exampleLaszlo Agocs2014-09-101-10/+11
| | | | | Change-Id: I904782e6a54c8df63a2e187cdfed5a3193ff2a54 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Beautify the qquickviewcomparison exampleLaszlo Agocs2014-09-102-9/+20
| | | | | | | | | | | Remove the red rectangle. Change the background color to a gradient. (taken from rendercontrol) Disable the transparency checkbox everywhere but Linux since it usually will not work. (too much hassle with platform specifics like frameless windows, etc.) Change-Id: I21488386cddc5841a2bdc8104e7abb197b075b0d Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-281-0/+3
|\ | | | | | | Change-Id: I92b91cce499ed4bec64521a581276f397792e218
| * Doc: Added a link to the QML advanced tutorialVenu2014-08-261-0/+3
| | | | | | | | | | | | | | | | | | This avoids the need to duplicate the example details that are already covered in the tutorial. Task-number: QTBUG-37203 Change-Id: If7e762dc1d9a572b83bddffe7982aec9a6363408 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Fix up vao usage in qquickviewcomparison exampleLaszlo Agocs2014-08-261-3/+6
| | | | | | | | | | | | | | | | | | | | The binder calls create() if needed, so drop that call. In the render function however, drop the binder. Trying to create() again and again on every frame is a waste of time. Change-Id: I1e9cd8e2c97030b96e604256661e65ce75446e9d Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Simon Hausmann2014-08-262-1/+2
|\ \
| * | Merge remote-tracking branch 'origin/5.3' into 5.4Simon Hausmann2014-08-262-1/+2
| |\| | | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlobjectcreator_p.h Change-Id: I60858ddb46866a8fa1a8576bb05b412afeeb4e41
| | * Added the QtSQL dependency info. to the project fileVenu2014-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Without this information the app fails to find the plugin required to load the QtQuick.LocalStorage module on Android. Task-number: QTBUG-37203 Change-Id: I245012e78ab8d1fe3205e08939f4baec58c20759 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Added a signal handlerVenu2014-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the onHeightChanged signal handler the transition of the NumberPad from left to right is incomplete especially on a mobile device where the window is scaled to fit the view. So the NumberPad ends up hidden behind the Display. Task-number: QTBUG-36086 Change-Id: Iab021c9f2572a4ac83bc393dddc24ddd31849cb4 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Added an example that shows how to consume texture providers from C++.Gunnar Sletta2014-08-269-1/+608
| | | | | | | | | | | | | | | | | | | | | And how to use use two textures in the same material. Change-Id: Idcc618ed359422c2a104eeed105b7c4f5086ee4e Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>