aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-0865-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also fixes the build of two benchmarks, tst_affectors and tst_emission. Conflicts: src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro src/qml/qml/ftw/qhashfield_p.h tests/benchmarks/particles/affectors/tst_affectors.cpp tests/benchmarks/particles/emission/tst_emission.cpp tests/benchmarks/qml/pointers/pointers.pro tests/benchmarks/qml/pointers/tst_pointers.cpp tests/benchmarks/qml/qmltime/qmltime.pro tests/benchmarks/qml/qquickwindow/qquickwindow.pro Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2
| * Purge sRGB chunks from PNG in documentation.Edward Welbourne2016-03-249-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Various tools grumble about sRGB tables in PNG images; and our handling of them doesn't pay attention to these, so purging them makes the images smaller with no loss to the images. Change-Id: I23d7a43ba6c6ce6cafa11c1950a118a73f4d07cd Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-2456-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Various tools grumble about sRGB tables in PNG images; and our handling of them doesn't pay attention to these, so purging them makes the images smaller with no loss to the images. Change-Id: If3baf60fb7c0045446ddfddecef96374845e739e Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Remove traces of the discontinued android-no-sdk platformEirik Aavitsland2016-04-011-5/+1
| | | | | | | | | | | | Change-Id: Ie734d6bfcb492c8aeeb18909650a27b1288f2b52 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-018-113/+140
|\| | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro Change-Id: I3ca8f0422828191b7e19539c25f31f2d048e9f18
| * Doc: Move documentation for painteditem exampleVenugopal Shivashankar2016-02-262-2/+0
| | | | | | | | | | | | | | | | | | | | | | Makes no sense to maintain the documentation in a separate directory outside the example source tree. Task-number: QTBUG-50405 Change-Id: I660ea712603aed5e7cbbd7b060ca064480de4e11 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * StocQt demo: Bugfixes and improvementsTopi Reinio2016-02-246-111/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | - Update the list of NASDAQ-100 companies - Add code for handling invalid entries (stock IDs) - Simplify top-level navigation logic. The app now opens in list view with no stock pre-selected. - Fix math for calculating change percentages Change-Id: I6aaab45f5a391f9636123c0ddca73656fab79916 Task-number: QTBUG-50651 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Move QtQuick.Layouts to qtdeclarative from qtquickcontrolsJan Arve Saether2016-02-267-0/+285
| | | | | | | | | | | | | | | | This is in order for it to be available without having to install Qt Quick Controls Change-Id: I3f0d0dc108829947cd189b7861944e556e00cef3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-121-2/+3
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979
| * Don't call render during expose, since we are already calling render().Jan Arve Saether2016-02-051-2/+3
| | | | | | | | | | | | | | | | | | This causes drawing artifacts on Win7 with ANGLES d3d11 backend. Task-number: QTBUG-49923 Change-Id: I801282c4359bd485d1894e409e34393b4264d994 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-2912-22/+215
|\| | | | | | | Change-Id: Iec1b2de53c275996364c4bab0123ccb3e6e9895e
| * photosurface demo: Improve handling of image directories.Friedemann Kleint2016-01-292-3/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to pass URLs on the command line. If no argument is given and the pictures location as returned by QStandardPaths exists and has contents, show it, Otherwise, show the file dialog as was before. Set context properties containing pictures location, image name filters and initial URL. Derive the image filter string from QImageReader/QMimeDatabase. Change-Id: I89bdff27416bf8ef725aa4e17853b2f634cf059b Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * stocqt example: Choose font depending on platform.Friedemann Kleint2016-01-279-17/+127
| | | | | | | | | | | | | | | | | | | | | | The example used the font "Open Sans" which is only available on UNIX platforms and causes it to look baroque on WinRT. Add a settings file specifying the font and override via file selector. Change-Id: I1a9284d928ac57289d75b5fb9477849ac518787b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Doc: Corrected display qml code in photosurface.qdocNico Vertriest2016-01-261-2/+4
| | | | | | | | | | | | Change-Id: Ic4e0dcc6bd91921cfea68e0cfe805e8369f58618 Task-number: QTBUG-49810 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-222-0/+3
|\| | | | | | | Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec
| * Doc: Added brief statements for examples overview pageNico Vertriest2016-01-112-0/+3
| | | | | | | | | | | | Task-number: QTBUG-50261 Change-Id: Ie7e7ce2fdb872f1628eeb6dbcb415cecbbe92216 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-01-2044-728/+1476
|/ | | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I09ba19590e9425d5116a6c27cbc183debb485dde Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Doc: Added brief statements for Qt examples overview pageNico Vertriest2016-01-055-0/+7
| | | | | | Task-number: QTBUG-50101 Change-Id: I0a7a8d7c3312923d956082fed7fcdf6567b44a7d Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Update examples to deal correctly with fine-grained wheel eventsAllan Sandfeld Jensen2015-11-301-4/+3
| | | | | | | | | Zooming in large steps on every wheel-events breaks with fine-grained wheel events like we get on touch-pads. We should therefore not encourage that in our examples. Change-Id: Ie2e70b91c66c73f12ef1f6cd55c8610ae70b36ed Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Purge spurious execute permissions.Edward Welbourne2015-09-301-0/+0
| | | | | | | | JavaScript, README and QML are not meant to be run from the shell. Change-Id: Ia1ddf621e2e341639daac651e2b4954364407574 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix up flawed TranslucentBackground usage in docs and examplesLaszlo Agocs2015-09-283-24/+13
| | | | | | | | | | | | | | | | | | Following the qtbase fixes, start doing things correctly in the QQuickWidget examples too. Remove the checkbox and use a --transparent command line argument (like in hellogl2). In addition --transparent --no_render_alpha can be used to verify the most problematic case: when alpha is present and the backingstore contains semi-transparent pixels in places where the underlying QOpenGLWidget is opaque. Here the result must still be an opaque pixel. This was previously ensured by a glColorMask call, now replaced by glBlendFuncSeparate in QPlatformBackingStore. Task-number: QTBUG-47276 Change-Id: Ia040f899405f73e95e957becee5df43683af9c39 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Doc: Corrected link errorsNico Vertriest2015-09-071-1/+1
| | | | | | Change-Id: Ia3973c9d46a9fe8c511d24e20c9c23a1c7d4660d Task-number: QTBUG-43810 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Fixed several link errorsNico Vertriest2015-09-071-1/+1
| | | | | | | Change-Id: I684b8c0d238b7592b49abc0156bbc9791fdf6991 Task-number: QTBUG-43810 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Photosurface demo: add Shortcuts for open and quit, tooltip for openShawn Rutledge2015-09-031-4/+42
| | | | | | | Demonstrates the new Shortcut.sequenceString property. Change-Id: I6c523a46b595610b310070214c31f3fbd79a3d28 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Simon Hausmann2015-08-281-1/+1
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-211-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: tools/qml/main.cpp Change-Id: I6d521b21be85d91ebb96c28e2c64186f02d94842
| | * Don't try to link to SQLite plugin when building samegame statically.Mitch Curtis2015-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the linking to a SQL driver that isn't a plugin Task-number: QTBUG-42926 Change-Id: I6d51fce7bb924d8b778fe36fa9f908c6fda3da13 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | | Doc: Rename sections in Touch Interaction example documentationTopi Reinio2015-08-261-5/+5
|/ / | | | | | | | | | | | | | | | | A section title 'Flickable' caused mislinking when using \l {Flickable}, and the intention is to link to the Flickable QML type reference. Change-Id: I2945fc675f0adcf0fe97d1d5f2ed0301c6e9f64b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Ulf Hermann2015-08-184-68/+69
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/debugger/qv4debugservice.cpp src/qml/jsruntime/qv4value_inl_p.h src/qml/jsruntime/qv4value_p.h src/qml/memory/qv4mm.cpp src/qml/memory/qv4mm_p.h src/qml/qml/qqmlnotifier_p.h src/qml/qml/qqmlproperty.cpp src/quick/items/qquickflickable.cpp src/quick/items/qquicktextedit.cpp tests/auto/quick/qquickwindow/BLACKLIST The extra changes in qqmlbinding.cpp are ported from changes to qqmlproperty.cpp that occurred in parallel with writeBinding() being moved to qqmlbinding.cpp. Change-Id: I16d1920abf448c29a01822256f52153651a56356
| * Fix typo in squircle example.Mitch Curtis2015-07-281-2/+2
| | | | | | | | | | | | Change-Id: I352de9cdd6842f11395982212889b6f0ed3ecc70 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-07-201-1/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/quick/qquickwindow/tst_qquickwindow.cpp Change-Id: I272074fa2ca259439cae2f686325932f7f9d7c01
| | * Doc: Added the missing \brief and \image to the example docsVenugopal Shivashankar2015-06-021-1/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41996 Change-Id: Ica6e069c7753a2004a4a4c0e93a49d1f240569d3 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * | StocQt demo: Fix text layout issuesTopi Reinio2015-07-162-65/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The precision of the data received from the stock feed has changed, and so we must round it before assigning to Text objects to avoid overflow. This change also rearranges the layout of the StockInfo element, using Flow and proper word wrap and eliding for long company names to improve the look of the stock info view on narrow screens. Change-Id: I53aaefd1cdc984fcceae9874e5ca2f66b47a190d Task-number: QTBUG-47207 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | | Fix shared example header.Friedemann Kleint2015-08-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use new connection syntax and return -1 on load failures, which avoids hanging processes and empty windows in case some module is not installed. Change-Id: I4966c9657b752eee8612fa893a0489bc8a64ccfc Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | | Port examples to new connection syntax.Friedemann Kleint2015-07-2211-34/+30
| | | | | | | | | | | | | | | Change-Id: I121c59ac0ad56acb4cd54b99ecd37567368385ce Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-046-12/+63
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4engine_p.h src/quick/items/qquickitemsmodule.cpp src/quick/items/qquicktext.cpp src/quick/util/qquickpixmapcache.cpp tests/auto/quick/qquickwindow/tst_qquickwindow.cpp Change-Id: I90ecaad6a4bfaa4f36149a7463f4d7141f4a516a
| * | Calqlatr Demo: Adjust ListView delegate height based on font sizeTopi Reinio2015-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent the list tem text overflowing the delegate boundary. Task-number: QTBUG-45621 Change-Id: I46f35508ea49a2b435286de76dc9ab49620619a6 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * | Fix qml-i18n exampleSimon Hausmann2015-05-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f0e285381800c0809e5bfd3a4871a2283ea10fb9 renamed the example, but it did not adjust the context in the translations. From that point on the context didn't match anymore and the entire example stopped working. Change-Id: I491d518235aea07768b69c52d13b2bbf5060f61f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * | Fix rendercontrol example for screens with different dprLaszlo Agocs2015-04-282-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renderWindow() was not reimplemented in the example. This is pretty bad since renderWindowFor() fails to find a window and thus falls back to using the default device pixel ratio (which is the highest dpr present in the system). The result is broken content from Quick because it operates with a dpr of 2 any time a retina screen is connected, even when the example's own QWindow is placed on a normal screen. Add also a note to the QQuickRenderControl docs because it is easy to overlook. Task-number: QTBUG-45613 Change-Id: I31bf92ec285f3d9867a5604a4b4e3bea73791932 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * | Recreate the FBO on dpr change in rendercontrol exampleLaszlo Agocs2015-04-282-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Even when the window size is not changing. This provides a useful example of connecting to the screenChanged() signal. Task-number: QTBUG-45613 Change-Id: I0652838d9c0cfec8b64b3422997159f385445b20 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * | Avoid showing garbage when resizing the rendercontrol exampleLaszlo Agocs2015-04-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The threaded variant was working well since that triggers a render when resizing. The single threaded version lacked this and this resulted in showing garbage on OS X at least since the new FBO had undefined contents. Avoid this. Task-number: QTBUG-45613 Change-Id: Ibb3d3f7640bab5da913df1c0c63cc3a3aaafb140 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-224-4/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlbinding.cpp src/qml/jsruntime/qv4arraybuffer.cpp src/qml/jsruntime/qv4functionobject.cpp Change-Id: Ic752e9dfd69b282093651c9234c110a49762f06d
| * | add manual tests for touch interactionShawn Rutledge2015-04-212-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | So far there are manual tests for Flickable and MultiPointTouchArea. It can be expanded later. Change-Id: Ifa838b68f137a49647a208dc15f22c90f1e02d1f Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * | Address uninitialized pointer variablesHolger Hans Peter Freyther2015-04-202-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | Coverity CID 10721, 84861, 86705, 85424, 85422, 85259, 84863, 84857 Change-Id: Ia86970b5ac4e0be9de01b79b618d33011da6a328 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Include QQuickWindow::resetOpenGLState() in OpenGL under QML example.Gunnar Sletta2015-04-212-0/+7
| | | | | | | | | | | | | | | Change-Id: Ieae110475dfb3f91d68919c7075054b5400f9e73 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | Add QQuickAsyncImageProviderAlbert Astals Cid2015-03-267-0/+238
|/ / | | | | | | | | | | | | It allows for providers to implement threading on their side Change-Id: I34042b213ce7697a3e39470387357d733e15723c Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | Doc: Changed title GridView exampleNico Vertriest2015-03-051-6/+6
| | | | | | | | | | | | | | | | | | Changed title to avoid conflict between GridView QML type and example Task-number: QTBUG-44640 Change-Id: I59c83489e4029c1586ec462f6643fff0ef80155d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-243-6/+6
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf LICENSE.GPLv2 examples/qml/networkaccessmanagerfactory/view.qml src/qml/jsruntime/qv4runtime.cpp src/qml/jsruntime/qv4stringobject.cpp Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32
| * Update url location for missing Qt logoSergio Ahumada2015-02-171-2/+2
| | | | | | | | | | Change-Id: I21084651044f1db0c7863f2121431dffec8526e3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: link issues qtdeclarativeNico Vertriest2015-02-041-3/+3
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: I154ffa83512435c3e455937a3f81931a45d9e368 Reviewed-by: Martin Smith <martin.smith@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 19:42:10 +0000