Add Gradle project structure for JAR builds which allows CMake to run a Gradle build and also enables such code to be managed from IDEs easily. The default Android platform Jar include won't be needed because it's handled by Gradle, and the main QtAndroid.jar include is added automatically by qt_internal_add_jar(). This also update gitignore with Gradle, JDTLS and IntelliJ ignores. Task-number: QTBUG-132915 Change-Id: I86178c27db589c0da007abbf4ef98a0d81c6aa27 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Pick-to: 6.11 6.10 6.8 Change-Id: Icb5da94a58e50e32b41000c4a368ce475f3aec9e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The data structure version is supposed to encode any incompatible changes to our compilation unit format. Checking the compile hash and Qt version in addition is redundant and excessively restrictive. [ChangeLog][QtQml] You can now use QML code compiled with Qt Quick Compiler across Qt versions as long as the compilation unit format hasn't changed between those versions. You cannot rely on the compilation unit format to stay unchanged under any specific circumstances. However, we won't change it unnecessarily. Change-Id: I8c407b505ac7fa952f53fa25bb6d4e7caf0fba0c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
compile_commands.json is metadata export from cmake which is used by the static analysis tools. One way to feed information to these tools is to have a symbolic link in the source directory to the compile_commands.json file in the build directory. .cache is the folder that contains the index file generated by clangd. git should ignore both. Change-Id: I63ab801ef2d52093be7527ff70ee88a40399fbb5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Add a CMake bool variable QT_QML_GENERATE_QMLLS_INI to indicate to qt_add_qml_module that .qmlls.ini files have to be generated for each directory where qt_add_qml_module is invoked. The .qmlls.ini files are generated in the source directory. This option needs to be set explicitly by the user, either as normal or as cache variable. The .qmlls.ini files are required for qmlls to work properly in any editor, without needing custom qmlls-client implementations for every client that passes the build folder on to qmlls. Each source directory with a CMakeLists.txt that does the qt_add_qml_module command gets a .qmlls.ini that contains all the build folders of all qt_add_qml_module-commands of the current source directory. This mimics how qmlls searches for the .qmlls.ini (starting at the source file directory and going up until it finds a .qmlls.ini), and avoids having to save a map from source folders to build folders in the .ini file. Warn the user when using CMake versions <= 3.19: QT_QML_GENERATE_QMLLS_INI requires deferring the calls to write the .qmlls.ini files to make sure that all build paths of all qt_add_qml_module calls of the current directory can be written inside the .qmlls.ini file. For multi-config build, this just makes use of the last generated config and overwrites the .qmlls.ini files for the other files. This is similar to what CMake does for compile_commands.json on the ninja multi-config generator, see https://gitlab.kitware.com/cmake/cmake/-/merge_requests/7477 for example. Added some documentation about the option, and also a test. Fixes: QTBUG-115225 Task-number: QTCREATORBUG-29419 Task-number: QTCREATORBUG-29407 Change-Id: I4a463ff7af534de266359176188fb016d48cf2c4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
imagine/automotive already demonstrate the imagine style Pick-to: 6.5 6.6 Task-number: QTBUG-108751 Change-Id: Ibb1fe187571b6693b85dfc0a310fc806908194dc Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
The CMakeUserPresets.json file can be used to simplify configuring Qt, particularly with tools such as Visual Studio and Visual Studio Code. As opposed to the CMakePresets.json, the CMakeUserPresets.json should only contain user specific configurations, and should never be checked into source code management system. This file is already ignored in the top level Qt super-project, but to facilitate working with each individual submodule, we should also have this .gitignore in each submodule. Pick-to: 6.5 6.6 Change-Id: I7e8baa9b3bea437d61841ec20cf8fbd4d5826750 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
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-95173 Change-Id: I2cf31e30127e8cc2f10304cabf4ff7f5050633b8
[ChangeLog][QtQmlCore] Added QtCore QML module. Currently this only contains the StandardPaths singleton, but in the future could expose lots of useful types from Qt Core to QML. Fixes: QTBUG-92806 Change-Id: Ib99e2c5512ee04d6af1322f985fc9da965cf13a4 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>