aboutsummaryrefslogtreecommitdiffstats
path: root/.cmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 6.2.2Jani Heikkinen2021-11-031-1/+1
| | | | | Change-Id: Ic5d457b1b3a2e88c29a00a22ba21de4d6b97dffe Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Bump version to 6.2.1Jani Heikkinen2021-10-061-1/+1
| | | | | Change-Id: Id64179d0736306423d8a7dfda3fd6fae97900d9a Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENTIikka Eklund2021-10-021-1/+1
| | | | | | | | | Current value should be empty to reflect the branch status. Change-Id: Ieafa1a1dea89f18c6953e146c1c61c892926faae Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit de5c38327e56454a8df433bc85834be535ecbbda) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add conanfile.py to support builds with ConanIikka Eklund2021-06-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The build recipe uses the qtbase's 'bin/qt-configure-module' script directly which is recommended when building other Qt modules ouside the qtbase's -prefix. The recipe uses functionality from qt-conan-common Conan package via 'python_requires'. This recipe sets it's own Conan options that match with the module configure options. The recipe sets it's version number based on QT_REPO_MODULE_VERSION and QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT in .cmake.conf file. The dependency to qtbase, qtsvg and qtshadertools is declared using semantic versioning so that it will pick the latest available prerelease or final version of the major.minor.patch. Task-number: QTBUG-94384 Change-Id: I1f12434521d11f63c31a102bfbfaf923cb262965 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit d6ea619ac87a5ff9ed239b34a4c43a7e6fa141a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2021-02-221-1/+1
| | | | Change-Id: I89031620e380fd57e69eaf13b970849b97ffe42b
* Bump versionPaul Wicking2021-01-121-1/+1
| | | | | | | | CMake edition. Task-number: QTQAINFRA-4126 Change-Id: I33c124ae65fe18c304b47c9aaecf05c55616743a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* CMake: Regenerate qtdeclarative/srcAlexandru Croitor2020-05-291-0/+1
Includes - renaming of internal plugin api call - generation of QT_QMLTYPES_FILENAME - addition of a few TARGET_DESCRIPTION Change-Id: I72b5647b8c16af9945795ead62a075322b6bb2f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>