diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-02-05 08:09:43 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-02-05 08:09:43 +0200 |
commit | ca9dc62849b91f9e8107ace4fc1e0e12b7a2dba6 (patch) | |
tree | 188b531effcd1e87e1b4fe56ce34f4779157147e | |
parent | adac5b27781d03a3944fc47f60e4d827a78e3caf (diff) | |
parent | 55ad100680f35c6011b06fd2ea1cfbef81e87d21 (diff) |
Merge branch 'tqtc/lts-6.2.12' into tqtc/lts-6.2-opensource6.2
Conflicts solved:
dependencies.yaml
Change-Id: I519478d21363354abc7f7a12b4a5c8385808130f
-rw-r--r-- | .cmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.cmake.conf b/.cmake.conf index d9966dd..897ec4a 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.2.11") +set(QT_REPO_MODULE_VERSION "6.2.12") |