diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-12-16 21:02:02 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-12-16 21:02:02 +0200 |
| commit | dcc261bb59eb1a13277d02223a3997ea088316af (patch) | |
| tree | 0d023e3a47fad259ef7f1673059d26cea0f5dae4 | |
| parent | 6de81c34c2ae67decd9b1ef72e6e820d2c179f1d (diff) | |
| parent | cff39d24b7ed586d5476bf32624412e409ad8bf4 (diff) | |
Merge tag 'v6.2.11-lts' into tqtc/lts-6.2-opensource
Qt 6.2.11-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I79afde556802f25436d0b37439a4e5fb618f1983
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.cmake.conf b/.cmake.conf index 8f8ece91..d9966ddc 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.2.10") +set(QT_REPO_MODULE_VERSION "6.2.11") diff --git a/dependencies.yaml b/dependencies.yaml index 5acb8715..c20b3fc1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 9886ff37350f661aad5b8bfaf2776e8429f208a7 + ref: 3d6ea255dba81dd08532d56d4af6a56cb71940aa required: true ../tqtc-qtmultimedia: - ref: 0765318d8c7343c537eec4a64aa816aecda8851c + ref: 637a7ef595776f96f15a8be300fbaf0fe8094269 required: true ../tqtc-qtremoteobjects: - ref: 0aa94fe2ceb949d72ff904836c5916c1e12124bd + ref: 4388c0ac05f290b1707e9f7d25c7cc68dd61f728 required: true ../tqtc-qttools: - ref: b55d00194d05ad065599e4ddb174eadc15310196 + ref: 3818cdf1a1e511aa2bb9fab9347af7b7d9829d90 required: false |