aboutsummaryrefslogtreecommitdiffstats
path: root/examples/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Move StyleKit example out of quickcontrols example directoryDoris Verria2026-05-191-0/+3
| | | | | | | | | | | | Now that Stylekit is getting widget style support on top of the quick controls support, the quickcontrols folder is no longer the best fitted path to place the example. Move it out of quickcontrols in the parent directory into a dedicated stylekit dir and rename the existing example target to stylekitcontrols. This is a first step towards adding the Stylekit widget example. Change-Id: Iede8d2f8001e872292ef944c762aed688c0ee689 Reviewed-by: Topi Reinio <topi.reinio@qt.io>
* Add example showcasing Embedding QML to native Android Java projectKonsta Alajärvi2024-04-101-0/+1
| | | | | | | | | | | | | Add new example showcasing how to embed QML into native Android Java application. New folder platforms/android, which include the new Android Java project and Qt project in their own project folders. Pick-to: 6.7 Fixes: QTBUG-120716 Change-Id: Ibab8b7653eb7d4199b93630d03f3543d0d734c4a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Correct license for examples filesLucie Gérard2024-03-211-1/+1
| | | | | | | | | | | | | Example takes precedent over build system file type. According to QUIP-18 [1], all examples file should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 6.7.0 Task-number: QTBUG-121787 Change-Id: Ie8c2539e7659f53a1fd6b48f99ee883ee9aeb0a7 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Move Qt Quick Shapes examples back under Qt QuickEskil Abrahamsen Blomfeldt2024-02-011-1/+0
| | | | | | | | | | | | | | In order to be accessible from Qt Creator, the modules either has to have a separate landing page and qdocconf, or we need it under the same subdirectory as everything else. We currently want Qt Quick Shapes to be like Qt Quick Particles and be documented as part of Qt Quick, so the examples move back into a quickshapes/ subdirectory of examples/quick (like with examples/quick/particles/) Pick-to: 6.7 Change-Id: Ib7aaa75da7c4c9eeca6edb5ede7952598f37df89 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Move Qt Quick Shapes exampleEskil Abrahamsen Blomfeldt2024-01-061-0/+1
| | | | | | | | | | | | | Usually, we have separate top-level example directories for different modules, but since Qt Quick Shapes only had a single example, it was categorized under examples/quick. We now plan to add more, so to prepare for that, this sets up the normal structure with an examples/quickshapes directory. Pick-to: 6.7 Change-Id: I50016358b674c18bb2930459d4e0111862ddcedb Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Move undocumented qmltest example to tests/manualLucie Gérard2023-11-221-3/+0
| | | | | | Task-number: QTBUG-119117 Change-Id: I92cd8c754f9442a8efb3e0dd2b4b791010cacc7c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Examples: Use versioned CMake targets for Qt modulesKai Köhne2023-05-021-3/+3
| | | | | | | | | | | | 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>
* Remove "2" from Qt Quick Controls directoriesMitch Curtis2022-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Quick Controls 2 was named that way because it was a follow-up to Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer supported, we don't need to have "2" in the name. Work on this was already started for the documentation in 1abdfe5d5a052f2298b7bf657513dfa7e0c66a56. By doing this renaming a few weeks before feature freeze, it won't affect the release but still results in as little time possible spent manually fixing conflicts in cherry-picks from non-LTS releases as a result of the renaming. This patch does the following: - Renames directories. - Adapts CMakeLists.txt and other files to account for the new paths. A follow-up patch will handle documentation. It does not touch library names or other user-facing stuff, as that will have to be done in Qt 7. Task-number: QTBUG-95413 Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634 Reviewed-by: Mitch Curtis <mitch.curtis@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>
* Add cmake support for examplesFabian Kosmale2022-03-291-2/+0
| | | | | | | | | | | | | | qml-i18n needed to be ported to CMake first. It uses qt_add_translations introduced in 6.2 As a drive-by, move find_package calls from examples' CML to the top level CML, and make the QtSql dependency optional. Also make sure that we only add the dynamicscene example when the Quick target is available. Pick-to: 6.2 6.3 Fixes: QTBUG-90964 Change-Id: Id357eb14e4704753386e01393300966eb89b4e86 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Improve examples CMakeLists.txtKai Köhne2022-01-241-1/+1
| | | | | | | | | | | | | | | | | | - 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>
* Merge qtquickcontrols2 into qtdeclarativeMitch Curtis2021-07-281-0/+5
|\ | | | | | | | | Task-number: QTBUG-95173 Change-Id: I2cf31e30127e8cc2f10304cabf4ff7f5050633b8
| * Conversion of QtQuickControls2 examplesLeander Beernaert2019-10-081-0/+9
| | | | | | | | Initial Conversion of QtQuickControls2 examples. Change-Id: I21ddf792d039dc26e4ba58d8592101eb131618d3 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Switch examples to build as isolated sub-buildsCraig Scott2021-05-271-7/+1
| | | | | | | Task-number: QTBUG-90820 Change-Id: Id9157526898ba72cb64ee8256639b37357f7bacf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* Convert ExamplesLeander Beernaert2019-08-231-7/+13
| | | | | | | | 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 declarative buildAlexandru Croitor2019-06-171-3/+3
| | | | | | | | | | | | - qmltest examples should not be built for now (there's no ported CMakeLists.txt file) - when building QmlDevTools, qml_module_include_dir should only be included during building, because those are build directory paths. - QmlTest was missing some private dependencies to find private includes Change-Id: I22a77cd46f82bc61ab84aa7bc4c9d0e38a9d603a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Initial CMake portAlexandru Croitor2019-06-031-0/+11
Crude port of QtQml, QtQmlModels, QtQuick and a few tests and a few examples. Task-number: QTBUG-74136 Change-Id: I5de4d8215b33d1a4a72c2c0e7951e4b384f27e3e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>