diff options
| author | Tarja Sundqvist <[email protected]> | 2025-02-06 08:43:58 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2025-02-06 08:43:58 +0200 |
| commit | a1ca4a1231fc0e23cbae45bfb0c22e7615d4e21e (patch) | |
| tree | fc14a957c5cf9c657d5c6c8fe80f75200b5ea0a6 | |
| parent | c17c073ba13ab932d14442e4a4ba4935b91782e7 (diff) | |
| parent | e2ceb38bc8d2969420e06bf945f99b789b2d10f1 (diff) | |
Merge tag 'v6.2.12-lts' into tqtc/lts-6.2-opensourcev6.2.12-lts-lgpl6.2
Qt 6.2.12-lts release
Conflicts solved:
dependencies.yaml
Change-Id: Ib8d90c56fb9809cc405ab530972714f27ab6d00b
| -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 842b347..7733def 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.11") +set(QT_REPO_MODULE_VERSION "6.2.12") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index 63c6a48..db2f4d9 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.11 +MODULE_VERSION = 6.2.12 diff --git a/dependencies.yaml b/dependencies.yaml index 9c991d8..95566ec 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtdeclarative: - ref: 3d6ea255dba81dd08532d56d4af6a56cb71940aa + ref: a7c766a9863605eb81e8f0cdb4d2b93e087b5bde required: true ../tqtc-qtwebengine: - ref: 45c01c6e389f639948db46d627b0b378565aeda6 + ref: e23906fc7444a1d9d57bc1c3c2b09ebf1c3d3c64 required: false |