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>
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>
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>
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>
Task-number: QTBUG-119117 Change-Id: I92cd8c754f9442a8efb3e0dd2b4b791010cacc7c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
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>
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>
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>
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>
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>