aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* Make example work when QOffscreenSurface == QWindowGunnar Sletta2014-04-023-36/+47
| | | | | Change-Id: I7435d91b37a46c0bced301c5c9c82fdf499e0587 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Maroon example: use multimedia for audio; mute when inactiveShawn Rutledge2014-04-012-2/+2
| | | | | | Task-number: QTBUG-37742 Change-Id: If1a6ded9ccdaa4cd6f5e6e405e2d5caa21710d4c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix reading of shader sources in scene graph examplehjk2014-03-273-32/+8
| | | | | | Task-number: QTBUG-33080 Change-Id: I9219233ab7c7fbe89c0a9f1453d7c6aeeca498a1 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Fix typo in calqlatr example doc.Mitch Curtis2014-03-251-1/+1
| | | | | Change-Id: I2c51ea35af7de4a2152840ebf3bfb64ec2ed8d89 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix some documentation errors.Friedemann Kleint2014-03-242-4/+4
| | | | | Change-Id: I5d4b3e26742202c4b634d0001fd3658c7263c50a Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Add surface format to QQuickWidget.Laszlo Agocs2014-03-181-0/+7
| | | | | Change-Id: Id72a042588e37832a0d3757bad935c531ef8275a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Move Qt Quick Widgets example and document itTopi Reinio2014-03-149-1/+36
| | | | | | | | | | | | | | | Because QtQuickWidgets is part of Qt Quick module documentation, its examples need to also be moved under the examples/quick directory structure. This change moves the example, creates minimal documentation for it, and adds a link to it from the QQuickWidget class reference. Task-number: QTBUG-37272 Change-Id: Iffb67849f150b9aaf0edaef5852364e93f7752b8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add some error handling to the QQuickWidget example.Friedemann Kleint2014-03-131-12/+53
| | | | | | | | | Use a QMainWindow and display errors occurring during loading QML as well as scene graph errors (for example, failure to create an Open GL context) in the status bar. Change-Id: Icd9ad2bd2b809baf80d83a54e295c25b7fb1f94b Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* networkaccessmanagerfactory example: Fixed build with QT_NO_NETWORKPROXYOliver Wolff2014-03-121-0/+8
| | | | | | Change-Id: I803dd555961420b8189f36e1978a3fb65ab4d2a0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* networkaccessmanagerfactory example: introduced QCommandLineParserOliver Wolff2014-03-121-11/+28
| | | | | | Change-Id: I6385ee0c33a0a8cb411dbbdf5f6ea10f5ebde1a5 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add some error handling to the QWindowContainer example.Friedemann Kleint2014-03-051-13/+59
| | | | | | | | | Use a QMainWindow and display errors occurring during loading QML as well as scene graph errors (for example, failure to create an Open GL context) in the status bar. Change-Id: Id9cf190e8a4f40de0f18ab081e2747135221bb88 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Fix some typosSergio Ahumada2014-03-033-3/+3
| | | | | Change-Id: Iea540b768232ea423ea7f04e41655198931cf36d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* the qmlextensionplugins example and a bunch of reference examples need QtQuickOswald Buddenhagen2014-02-212-7/+11
| | | | | | Task-number: QTBUG-36893 Change-Id: If1f937113b651fd2255f8004739f2c601e3826bf Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* the shell example and a bunch of reference examples need no QtGuiOswald Buddenhagen2014-02-217-8/+8
| | | | | | Task-number: QTBUG-36893 Change-Id: I51e402c90bd727cd3066788e0864e887ab8cb9e4 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* QQuickWidget examplePaul Olav Tvete2014-02-205-0/+146
| | | | | Change-Id: I4211900ef6a04443bde0c95d074a4a29951b43b0 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-02-1145-2352/+36
|\ | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4ssa.cpp src/qml/jsruntime/qv4arrayobject.cpp src/qml/jsruntime/qv4context.cpp Change-Id: Ied5b23bec4dc14abe51127c507aed668f855c1e1
| * Doc: Merge duplicated example directoriesSze Howe Koh2014-02-0643-2331/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples/quick/customitems contains all the examples found in examples/quick/ui-components, plus 2 more (maskedmousearea and painteditem). There are some very minor differences between the duplicated files, regarding the "smooth" property. Apart from that, the examples are identical. The only file that is unique to examples/quick/ui-components is example-slideswitch.qdoc. Moving it does not change the generated HTML filename. The other examples do not produce any documentation. Change-Id: I507d9064a60fd1f3a1469c1e423d4c0a72c7dc41 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Improve Scene Graph - Simple Material example documentation.Mitch Curtis2014-02-061-11/+11
| | | | | | | | | | Change-Id: I5b77f7590c9f2cea9305014b8a9d4ab3a387eaa3 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| * Avoid out-of-bound accesses in Qt Quick example codehjk2014-02-051-10/+15
| | | | | | | | | | | | | | Task-number: QTBUG-36197 Change-Id: I5545c36a1ce9ea6c2451c92e0e79f65e5ab26c68 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | fix whitespaceOswald Buddenhagen2014-01-2272-178/+178
| | | | | | | | | | | | | | remove trailing spaces and expand tabs Change-Id: Ieacb9d096b612c45d1a64700044c114d1f7522bc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-01-171-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/dialogs/DefaultFileDialog.qml src/imports/widgets/qquickqfiledialog.cpp Change-Id: I00de6dd05cb773f01254061d585a82c90b229acd
| * Fix some compiler warnings in tests and examples.Christian Kandeler2014-01-151-0/+1
| | | | | | | | | | Change-Id: Ia739c995005635caf6fd0bd4e495ed8567350e83 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-102-1/+2
|\| | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4managed_p.h Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f
| * Fix some typos in documentation.Jeff Tranter2014-01-091-1/+1
| | | | | | | | | | | | | | | | | | Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code. Change-Id: I2d91518900c9b60ee8e8a8f549c88a1d50632b3d Reviewed-by: Nico Vertriest <nico.vertriest@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Updated the code to resize the text box on window resizeVenu2014-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | Without the QQuickView resizeMode set to QQuickView::SizeRootObjectToView the text box control appears in the middle and blocks the squircle effect. Task-number: QTBUG-35584 Change-Id: Ib8fc40f087a44d05062e900c33b9de5a620d1cc5 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | remove QtQuick.Dialogs and related modulesShawn Rutledge2014-01-0712-975/+0
| | | | | | | | | | | | | | | | | | | | | | | | They are being moved to the QtQuick Controls repository (see change ba9ba084124403bd8930e29d8afcea9d64b6c0b6 in qtquickcontrols). This makes it possible to use QtQuick Controls in the implementation. [ChangeLog][QtQuick][Dialogs]Moved dialog implementations from qtdeclarative module to qtquickcontrols module due to dependencies Change-Id: I76d5b71b185dd14a188ea68f18bfec61b4bf2f41 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-061-1/+1
|\| | | | | | | Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0
| * Doc: Fix broken linksSze Howe Koh2013-12-301-1/+1
| | | | | | | | | | Change-Id: I4c4577edde96978a986606bf30fbb925f871bd42 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-244-6/+7
|\| | | | | | | | | | | | | Conflicts: src/quick/items/qquickrectangle.cpp Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc
| * systemdialogs example: path to /tmp is different on WindowsShawn Rutledge2013-12-231-1/+1
| | | | | | | | | | | | Task-number: QTBUG-34100 Change-Id: Ic06ed2933b76704b1a298de826cbe6b8587fee76 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Doc: Updated the image URLVenu2013-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The existing HTTP url for logo.png was automatically redirected to an HTTPS url which fails without SSL. So updated the example to use different HTTP url. Also updated another image URL, which is invalid now. Task-number: QTBUG-35557 Change-Id: I793fc5ebda64b21f443da7db9ecda76ae951d5bf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>