summaryrefslogtreecommitdiff
path: root/examples/quick/canvas
Commit message (Collapse)AuthorAgeFilesLines
* Examples: Use versioned CMake targets for Qt modulesKai Köhne2023-05-021-4/+4
| | | | | | | | | | | | Use e.g. Qt6::Core instead of Qt::Core. This is better matching the find_package(Qt6 ...) call, and also avoids issues that the versionless targets have. Pick-to: 6.5 Task-number: QTBUG-113277 Change-Id: Ib80f885e9f73fb9ad54b9e9b22cae2318877dc07 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Canvas example: Improve usage of best practicesOliver Eftevaag2023-03-029-431/+658
| | | | | | | | | | | | | | | | | This commit updates the example in order to adopt as many best practices and follow our coding conventions from our official documentation. - qmllint will report no erros with this patch (As long as the shared module is imported). - strings are translated. - JS statements no longer end with semi-colon. - Removed unused properties and marked those that are only read as readonly Pick-to: 6.5 6.5.0 Change-Id: Ibe0d0750d48018b618a5cf8c3bcecb7e29488274 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Replace AUTO_RESOURCE_PREFIX with Qt CMake Policy in examples, testsAmir Masoud Abdol2023-02-211-2/+1
| | | | | | | | | | | | | | | | Every instance of AUTO_RESOURCE_PREFIX has been replaced by either qt_standard_project_setup(REQUIRES 6.5) or with qt_policy(SET QTP0001 NEW), mainly in tests. In addition, I added a warning message for the case where AUTO_RESOURCE_PREFIX is used. Pick-to: 6.5 Task-number: QTBUG-96233 Change-Id: I323a15e9d0bb5fe6ba649365314af9fc2ad67bda Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
* CMake: Allow omitting the version of QML modulesUlf Hermann2023-01-271-1/+0
| | | | | | | | | | | | | | | | | Also, drop all the VERSION 1.0 lines from the examples and tests. 1.0 is actually a bad default version since it's before all the Qt versions. [ChangeLog][QML] You can now omit the VERSION argument to qt_add_qml_module(). This will automatically generate the highest possible version. Pick-to: 6.5 Task-number: QTBUG-99146 Change-Id: Ic10ec69b87c224e0e94e1785f65653815d4c778c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* Quick examples: Modernize cmake files according to our guidelinesOliver Eftevaag2023-01-161-8/+5
| | | | | | | | | | | | | | | | The following changes are made to the CMakeLists.txt files in all quick examples: - Use PRIVATE linkage when possible. - Use qt_standard_project_setup() - Set WIN32 and MACOSX_BUNDLE in qt_add_executable() instead of set_target_properties() Pick-to: 6.5 Change-Id: I18217585aec56794b327f103d6959879df59d68a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-09-071-1/+1
| | | | | | | Task-number: QTBUG-105718 Change-Id: Id89ed14990804a5024183e75382cc539d4293da1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-081-0/+3
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I72c89a98c42bbc9234d8495e9e503bec81d11037 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Adapt examples to AUTO_RESOURCE_PREFIXUlf Hermann2022-06-242-1/+2
| | | | | | | | | | | Examples that don't explicitly set NO_RESOURCE_TARGET_PATH get the AUTO_RESOURCE_PREFIX now. Task-number: QTBUG-103452 Change-Id: I6b41e96ce5620079f60ca2f967b0a2e611c1f738 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-1111-516/+22
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Improve examples CMakeLists.txtKai Köhne2022-01-241-11/+5
| | | | | | | | | | | | | | | | | | - Remove # generated from xyz.pro comment from pro2cmake - Remove "# special case" markers for pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Pick-to: 6.3 Change-Id: I0d6bfb06c4b25e9921d3d2bf31d977150f12b31b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Fix the canvas example to use a QML moduleUlf Hermann2021-09-042-55/+27
| | | | | | Pick-to: 6.2 Change-Id: I84445909adafbd2cf0f5654fa78a005ed243536f Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-171-1/+1
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-95636 Change-Id: I9f76b787533dad1c469fbb8c69df6c27b20a9aa3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-211-61/+16
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-86726 Change-Id: If6e1033642d98ccd40daeb57a453c0e5bc2985da Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update canvas example to use QtQuickControls2Oliver Eftevaag2021-03-1011-54/+159
| | | | | | | | | | | | | The QtQuick examples should ideally have a more native look and feel. Making them use controls from QtQuickControl will cause them to adapt to the desktop style. This patch replaces the previous Sliders from the 'shared' directory, with Sliders from QtQuickControls2 Task-number: QTBUG-90880 Change-Id: I90521abf7059950521bc3d1a54994d2cca07259d Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* CMake: Regenerate examples to set the WIN32_EXECUTABLE propertyAlexandru Croitor2020-10-261-0/+4
| | | | | | | | | As well as the MACOSX_BUNDLE properties as necessary. Task-number: QTBUG-87664 Task-number: QTBUG-86827 Change-Id: I46769fb543acb2cbeba122470b5e44ad478fbe4e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Regenerate examples to use qt_add_executableAlexandru Croitor2020-10-201-1/+1
| | | | | | Task-number: QTBUG-87661 Change-Id: Ie5bba408000211b24694aa0143bdf79c4a298f42 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* CMake: Regenerate qtdeclarative/examplesAlexandru Croitor2020-05-291-1/+5
| | | | | | | | | Includes - new example installation paths - one case of QT_QMLTYPES_FILENAME addition Change-Id: I24423da9b04b6ecc8445017fa35f148dd43b1829 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2020-01-161-1/+0
|\ | | | | | | Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
| * examples: Drop bogus referenceUlf Hermann2019-11-181-1/+0
| | | | | | | | | | | | | | Canvas doesn't have an "alpha" property. Change-Id: I7cedff568ec062d7586b6b7333e32a8e52d2e8a9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Regenerate ExamplesLeander Beernaert2019-10-141-2/+2
| | | | | | | | | | Change-Id: I2fbfb44bbb6d667e022bffb480feaf74ff0d0a5e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Update Examples with lowercase qt6_add_resources()Leander Beernaert2019-09-201-2/+2
| | | | | | | | | | | | | | | | Re-run pro2cmake on all exampls. Change-Id: Iafd1092beff023b407a8f29c2a5b651f2e534b75 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Convert ExamplesLeander Beernaert2019-08-231-0/+127
|/ | | | | | | | This patch converts all examples in qtdeclarative except for a few exceptions which require a public facing qml plugin api. Change-Id: I2cd2b1bb455be8b48796893a8235dea7f8b35aa2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix outdated FDL license headerKai Koehne2017-10-171-5/+5
| | | | | Change-Id: I76dccf547de40b5e72fd7abaa062fa96cb2c118a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix outdated BSD license headerKai Koehne2017-10-179-27/+117
| | | | | Change-Id: Icc08925454445fc9497fb3bfd2c26efe90605983 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix smile qml exampleIonut Alexandrescu2017-02-211-6/+6
| | | | | | | The mouth line was not closed and the right eye line was too big Change-Id: Ifea4a8dbdd38df3c83cd80491210585fcbb76d3c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* 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>
* Fixed license headersJani Heikkinen2015-02-179-27/+27
| | | | | Change-Id: I4d5640ff95e1361ec7e65fb3e87d7726d8185ff5 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Update copyright headersJani Heikkinen2015-02-1210-51/+51
| | | | | | | | | 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>
* Doc: apply title case to all section1 titlesNico Vertriest2014-09-241-4/+4
| | | | | | Task-number: QTBUG-41250 Change-Id: I303d989992c9685f73baae50c64accf71b43549f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Updated "Qt Quick Examples" pages.Jerome Pasion2014-06-051-11/+33
| | | | | | | | | | | -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>
* 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>
* Doc: Fix some broken snippet pathsSze Howe Koh2013-05-061-5/+5
| | | | | Change-Id: Ib79bfbea402b86e26a503de47383522317ca906b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Canvas: Do not apply transform to text twiceFrederik Gladhorn2013-05-031-3/+2
| | | | | | | | | | The path already has the transform, no need to apply it a second time manually. Task-number: QTBUG-30501 Change-Id: Iedcb2e2f85a1f9eeac8e6264e00536c43bf16ddb Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix duplicate examples for qml/quick modulesKai Koehne2013-03-211-1/+1
| | | | | | | | | | | | Task-number: QTBUG-30233 Change-Id: Ic0a6d9112dbf8903d68f571e0ac853d89ff31ebe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Fix some titles and linksSze Howe Koh2013-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Fixed some uses of terminolgies in qdoc files.Jerome Pasion2013-03-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | -"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>
* | Various improvements to Canvas examplesJens Bache-Wiig2013-02-2625-1088/+571
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1015-15/+15
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Use resource files for most examplesKai Koehne2012-12-123-4/+37
| | | | | | | | | Make examples shadow-build-friendly by using resource files instead of trying to derive the qml path from applicationDirPath(). Change-Id: I669424554c772d9b261249b366247190f5fbd8b1 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-12-103-7/+5
| | | | | | | | follow respective change in qtbase Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Fix example lists for Qt QuickEskil Abrahamsen Blomfeldt2012-11-301-5/+6
| | | | | | | | | Snippets are fixed, the extending-examples are moved from QtDoc, groups are used to generate the lists and I've removed some unrelated stuff from the list of Qt Quick examples. Change-Id: I347b6fa8a29b1cede1164fa858488f34507e1a17 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fix installation of examples.Christian Kandeler2012-11-221-1/+3
| | | | | | | | | | Enable examples to be built in the target tree. This entails installing the project files and possibly other missing stuff. Task-number: QTBUG-27977 Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-201-0/+0
|\ | | | | | | Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25
| * Doc: Moved all content in the doc directory.Venugopal Shivashankar2012-11-081-0/+0
| | | | | | | | | | | | | | | | | | - most images to the corresponding examples directory - Fixed a few broken links to the examples and qdoc pages - removed the obsolete and unused images and qdoc pages Change-Id: I18f9551b42ec713b81e3f69694a2bd04b1ebf794 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | Install the Qt Quick 2 examples in the "qtquick" dirThiago Macieira2012-11-091-2/+2
|/ | | | | | | | Leave the "qtdeclarative" dir for Qt Quick 1, which is where it used to be in Qt 4. Change-Id: I44997771d77617564fc608c1aba95e3ada8f9a69 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Add missing contents dir to installation of canvas exampleMiikka Heikkinen2012-10-101-1/+1
| | | | | | | Task-number: QTBUG-26995 Change-Id: Ib346c857f9e0bc97bb2e4365abddb6475c7142d4 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2315-116/+116
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Examples: Moved example documentation.Jerome Pasion2012-09-212-31/+58
| | | | | | | | | -inline \example pages into separate .qdoc files -fixed broken links to paths -moved ui-components under examples/quick Change-Id: I6e009b9213be3e1f4bed51bdbeb76a7a2142c80b Reviewed-by: Martin Smith <martin.smith@digia.com>
* Update usage of smooth and antialiasing.Michael Brasser2012-08-287-8/+7
| | | | | | Change-Id: Icc8b28bdd466389ed3f269f076f1bdb6e9abe3f2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
View Lorry Controller Status