diff options
| author | Tarja Sundqvist <[email protected]> | 2024-10-07 23:29:32 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2024-10-07 23:29:32 +0300 |
| commit | 8828766dd8b4c867603299f6fabf6ca316039b44 (patch) | |
| tree | 0d64a391a7cf6841ecc82f9ddaed9e433079cc80 | |
| parent | 2f4301b9796e2172fafe6cd5eb50b557eaa401ba (diff) | |
| parent | 8be5f7ba4b359d95aab1cbb2c3c05064b69bf127 (diff) | |
Merge tag 'v6.2.10-lts' into tqtc/lts-6.2-opensourcev6.2.10-lts-lgpl
Qt 6.2.10-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I3512204b01abc50c1f1ea2dfbd316cc6bb95ea01
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.cmake.conf b/.cmake.conf index beccb22..31a36e3 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.9") +set(QT_REPO_MODULE_VERSION "6.2.10") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index cc80a94..35f2f46 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.9 +MODULE_VERSION = 6.2.10 diff --git a/dependencies.yaml b/dependencies.yaml index 35e409b..9043893 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtdeclarative: - ref: b078003a3c81f1438dcaf932371d564003c99395 + ref: 9886ff37350f661aad5b8bfaf2776e8429f208a7 required: true ../tqtc-qtwebengine: - ref: 17e9f29577ea6573c7c348083ff510ee60c7e8cc + ref: 183d0101f41fd5a1007708a9416d1f12db31c1cb required: false |