aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | Mark custom node in textureinthread dirty after rendering textureTasuku Suzuki2014-08-261-0/+2
|/ / | | | | | | | | Change-Id: I4401a6db18b1fcc69403062f3f4775d3b62dfd3e Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | Update license headers and add new licensesJani Heikkinen2014-08-2544-833/+481
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Add QQuickWidget::setClearColor()Laszlo Agocs2014-08-133-15/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And make qquickviewcomparison able to demonstrate how to create a partially transparent QQuickWidget. Avoid also recreating the QQuickView/QQuickWidget multiple times when switching between the radio buttons. [ChangeLog] Added QQuickWidget::setClearColor() in order to support semi-transparent QQuickWidgets. Change-Id: I319ad4afbe909530274d09f2a7fcff23730d6ebd Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | Doc: Remove duplicated wordsTopi Reinio2014-08-122-4/+4
| | | | | | | | | | | | | | | | Removes duplicated (repeated) words and fixes other minor documentation issues. Change-Id: I891f2b3e60194b207737425c1dcc1d35a5bd921a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Finish render() support for QQuickWidgetLaszlo Agocs2014-08-111-1/+31
| | | | | | | | | | | | | | | | | | The enablers are already in. Now we just need to use the virtual in QQuickWidgetPrivate and test it. Task-number: QTBUG-39562 Change-Id: I1faf5a0a244ba4169fb8f9b0dae657304038b60e Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Expose the scene graph publically through a QSGEngine classJocelyn Turcotte2014-08-017-0/+395
| | | | | | | | | | | | | | | | | | This change wraps QSGRenderContext and QSGContext in a new QSGEngine class, and expose a public interface of QSGRenderer through a QSGAbstractRenderer to make it usable on a standalone window or FBO. Change-Id: I2d41187472424f5ea64650a006bcd61f2711f6b9 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Merge remote-tracking branch 'origin/5.3' into devSimon Hausmann2014-07-261-3/+334
|\| | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4ssa.cpp src/qml/jsruntime/qv4arrayobject.cpp src/qml/jsruntime/qv4engine.cpp Change-Id: Ie3ef6202b6a3a8521971e1be10c40c6a2db6989c
| * Doc: add documentation for the RSS News exampleLeena Miettinen2014-07-181-3/+334
| | | | | | | | | | | | Change-Id: I87d7e43c19c897be3b98b219dacaf0f2bd30c1dd Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Add containsPress property to MouseAreaMartin Jones2014-07-162-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is very common to use pressed and containsMouse properties together to highlight a pressed item, e.g. property bool highlighted: pressed && containsMouse The containsPress property allows simplification and optimization of user code. [ChangeLog][QtQuick] Add containsPress property to MouseArea Task-number: QTBUG-40130 Change-Id: Ie286d431154eb37a99e57e4cf881d68d7cbbe31d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-1031-90/+387
|\| | | | | | | Change-Id: Iba61035910c46627e5e1c3824757da7b3d573657
| * Calqlatr demo: Remove unused filesNiels Weber2014-07-0712-71/+1
| | | | | | | | | | | | | | There were a few images etc that were never used. Remove them. Change-Id: I606241903cf098cb495aa06ac4c595fb175cd9fc Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Remove usage of external dependencies from the RSS News demoTopi Reinio2014-07-072-58/+23
| | | | | | | | | | | | | | | | | | | | Examples in qtdeclarative shouldn't depend on Qt Quick Controls, Layouts, or add on modules like Qt Graphical Effects. Change-Id: Ic069ed3223a4cfebde5263e846ae394aebed0b33 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
| * Doc: correct link/compilation errors in Qt DeclarativeNico Vertriest2014-07-0218-1/+403
| | | | | | | | | | | | | | Task-number: QTBUG-34749 Change-Id: I507d54b0568d77c6099a0bd99f5c369b8667032a Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Change default to QQuickWidget in the comparison exampleLaszlo Agocs2014-07-091-1/+1
| | | | | | | | | | | | | | | | This way the example will run on embedded devices (eglfs)out of the box and will only abort when switching to QQuickView. Change-Id: I07855ac1a9d112f868adf6fcab8db888ba0888ec Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/devFrederik Gladhorn2014-07-0243-400/+2694
|\ \
| * | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-0243-400/+2694
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/quick/scenegraph/openglunderqml/squircle.h src/quick/doc/src/qmltypereference.qdoc src/quick/scenegraph/qsgthreadedrenderloop.cpp Change-Id: Ife4f4b897044a7ffcd0710493c6aed1d87cf1ef9
| | * Skip rssnews demo if xmlpatterns is not presentLaszlo Agocs2014-07-011-1/+2
| | | | | | | | | | | | | | | | | | | | | Otherwise builds without the QtXmlPatterns module will fail. Change-Id: I11d0b84653f8d59787b09cd9c12977d18be92729 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: Add documentation for the Maroon in Trouble exampleLeena Miettinen2014-06-275-4/+851
| | | | | | | | | | | | | | | Change-Id: I8b272894ef6374aeb6ec09275d7ce96d16a6be0f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * Improve RSS News Qt Quick DemoTopi Reinio2014-06-2024-281/+515
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add main.cpp for launching, use Qt resource system - Update feed URLs - New layout and images - Make the example scalable, react to orientation changes - Use graphical effects and animations - Display time and link for each news item - Fix license headers to use the correct license Task-number: QTBUG-37203 Change-Id: I6f8941cbdaed78a3dee30305496b3ea7777ba3e3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| | * Add a QQuickWidget - QQuickView comparison exampleLaszlo Agocs2014-06-1911-1/+1201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Besides serving as a side-by-side test tool for QQuickView and QQuickWidget (including multisampling), it also demonstrates some useful practices for rendering 3D content via QQuickFramebufferObject. Done-with: Paul Olav Tvete <paul.tvete@digia.com> Change-Id: Ie73e998ee91e32ef1535dd6f0f65c8a69addcc5e Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| | * Separate renderer out in "OpenGL under QML" example.Gunnar Sletta2014-06-163-104/+115
| | | | | | | | | | | | | | | | | | | | | The example was promoting very bad practice. Change-Id: Ibb83780ec33e59ee5aabf65a775705dd0da681e6 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * Use newest QtQuick in rssnews demoNiels Weber2014-06-165-10/+10
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-37203 Change-Id: I720e510b875f63eb5c184cd7d8b9eb127674d505 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | | Tools and examples: consistently use organization name QtProjectShawn Rutledge2014-07-021-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | This affects the location of the QSettings files or registry entries. Other parts of Qt are using this organization name so it's good to have all the settings in the same place. [ChangeLog][QtQuick] tools and examples consistently use the QtProject organization name Change-Id: I1fae4eaed0248411fe95dda9572d38006648b162 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Avoid direct GL calls in Qt Quick examples and testsLaszlo Agocs2014-07-015-5/+11
| | | | | | | | | | | | Change-Id: I204a5513708aeff5cae00d06d4f0c27c20a13ace Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Make QQuickRenderControl publicLaszlo Agocs2014-06-249-1/+803
|/ | | | | | | | | | | | QQuickRenderControl allows rendering Qt Quick 2 scenes into framebuffer objects which can then be used in arbitrary ways in Qt-based or 3rd party OpenGL renderers. [ChangeLog][QtQuick] Introduced QQuickRenderControl as a public API. Task-number: QTBUG-37944 Change-Id: I84262243b261b35cefdf67ec6bba8127a0f29275 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Further improve the StocQt demoTopi Reinio2014-06-112-72/+129
| | | | | | | | | | | | | | | - Display the price scale on y-axis, highest trade volume on x-axis - Adjust grid size for the chart based on the active view - Fix incorrect drawing of volume data - Correctly scale the chart based on the price/volume ranges - Align the volume graph to the price chart and improve its look - Use Date.toDateString() instead of hardcoded month names - Minor fixes to layout Task-number: QTBUG-38254 Change-Id: I0e7ef18a152c7678371fb9c01f86d3d91a289472 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Add support for multisampling in QQuickWidgetLaszlo Agocs2014-06-061-2/+4
| | | | | | | | | | | | | | | | | Use a multisampled fbo when the requested format has samples > 0. Resolving happens after each rendering of the scene. The blit to the temporary non-multisampled fbo could be avoided, in theory, by sending the fbo instead of the texture id down the stack and performing a blit directly to fbo #0. This however involves a number of potential issues, for example due to the non-sharability of FBOs between contexts. Hence it is left as a future exercise. Task-number: QTBUG-39187 Change-Id: Iae98b969bcbc3bb57e6d73288496f5428913c826 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Doc: Updated "Qt Quick Examples" pages.Jerome Pasion2014-06-0518-185/+444
| | | | | | | | | | | -added instructions about running the example (using \include) -used the example names as sections in the collection pages -general editing and documentation polishing -updated copyright information Change-Id: I044f29fcc1921a541040505d5821acb06dc4cb35 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Photoviewer: Allow using the Android back button to go back.Niels Weber2014-05-271-1/+17
| | | | | | | | | Don't show back button on Android, as the system back button can now be used. Task-number: QTBUG-38122 Change-Id: Ia3a677f4626eaf34e23dfcc7997e4b850d8b7020 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Samegame: Add qsqlite as a needed QTPLUGINCaroline Chao2014-05-221-0/+2
| | | | | | | Required plugin are currently not detected automatically (QTBUG-35195). Change-Id: I58e21ff2219ed5ef3042a07d19dbfa914a10f2e5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Make a pro file based project out of the photoviewer exampleNiels Weber2014-05-2112-67/+175
| | | | | | | | | | | | Having a .pro file project is necessary to be able to deploy to Android. Further patches for Android support will be needed, but this is the base. Task-number: QTBUG-38122 Change-Id: I878ec1df50d7375ae9153f8a34f763b5678d7774 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Merge remote-tracking branch 'origin/release' into stableIikka Eklund2014-05-2021-719/+850
|\ | | | | | | Change-Id: I939d6b9d10b3f50d9024b80d7a215b8fd04e8d56
| * StocQt demo improvementMika Salmela2014-05-0221-719/+850
| | | | | | | | | | | | | | | | | | | | | | Along with general demo improvements, this task implements the new layout to the StocQt demo. Also few bugs on the functionality are corrected, like drawing the stock graph on right way and initial values reset on stock model when changing active stock. Task-number: QTBUG-38254 Change-Id: I9d3387ed0e3f23512b8e60c70246589c10237818 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: add docs for Photo Surface demoLeena Miettinen2014-05-131-4/+126
| | | | | | | | | | Change-Id: Id6f40b1b769fdd103cfb2afda172b1daf9b1a105 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: add docs for Calqlatr exampleLeena Miettinen2014-05-071-4/+112
| | | | | | | | | | | | | | | | Describe the QML and Qt Quick features that the example illustrates. Change-Id: I9a3656873ac1a5a8cdf31b1f85528b1bf081df79 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | fix copying of qmldir file to build dirOswald Buddenhagen2014-05-051-10/+2
| | | | | | | | | | | | Task-number: QTBUG-36252 Change-Id: Icbd956daf707105a5616d057c11b9aa1f55ff5d2 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Add dependency check for quickwidgetsZhang Xingtao2014-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | If not, there will be an error when building with -no-opengl option: "Project ERROR: Unknown module(s) in QT: quick-private" The quickwidgets module depends on qt quick module, and qt quick module depends on opengl. Change-Id: If74b5582bdd96ed19ec10dbc534d02146717bc08 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableJani Heikkinen2014-04-2314-35/+152
|\| | | | | | | Change-Id: I1214586499ab2876c8bc55a99367a0c938c8b919
| * Make the Clocks example use the resource systemTopi Reinio2014-04-235-4/+74
| | | | | | | | | | | | | | | | | | | | Make the Clocks example use the Qt resource system and the shared main(), in order to have easy deployment to all platforms and support for shadow builds. Task-number: QTBUG-37203 Change-Id: Ia235b6b2397cfaeb20f0c7ea0d6196c603b20099 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Doc: Improved Qt Quick Demos documentationJerome Pasion2014-04-169-31/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | -added include from qtbase/doc/global about running the example. -added link to "QML Applications" (main landing page for QML) -highlighted the names with \e -various documentation changes Task-number: QTBUG-33597 Change-Id: I9e23b8b61862c424f2a17003b3d1f5b2ef931ceb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Change slashes depending on host in tutorial gettingStartedQml.Friedemann Kleint2014-04-151-1/+1
|/ | | | | | Task-number: QTBUG-38224 Change-Id: Ib2c14b88bd86f2c1254be716a9fa4f93143bbd0a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Set font correctly in canvas example.Mitch Curtis2014-04-081-1/+1
| | | | | | | | | | | This fixes the following warning: Context2D: Missing or misplaced font family in font string (it must come after the font size). Task-number: QTBUG-38103 Change-Id: I0902e6e095fb76cdc8619229dccf2601007c3216 Reviewed-by: Jeff Tranter <jtranter@ics.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 03:12:37 +0000