diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 23:07:17 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-20 06:41:24 +0000 |
| commit | 40235be466095382836e9b544dc921077c47b417 (patch) | |
| tree | 9454db3e538b03e9f387eee937b93a5f1a3e2a16 | |
| parent | 42fb62219b3d41481f4065d222f227614f41fbe8 (diff) | |
| parent | 48abc06106b59191c981cbf88056c58b4db051a0 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource
Conflicts solved in a file:
dependencies.yaml
Change-Id: Ie918cf2551397516b5a9416637b67034ecbb091a
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 2 | ||||
| -rw-r--r-- | src/svg/qt_attribution.json | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.cmake.conf b/.cmake.conf index 07d90b8..e62fae5 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.7") +set(QT_REPO_MODULE_VERSION "6.2.8") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index 3f1a177..ae8c1a2 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.7 +MODULE_VERSION = 6.2.8 diff --git a/dependencies.yaml b/dependencies.yaml index fee29a4..f522f48 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../tqtc-qtbase: - ref: 694575a59b5370afc494fbf700eee8db1d1ec091 + ref: 67934c103800bae50c2ec1977758d40fa8e4e507 required: true diff --git a/src/svg/qt_attribution.json b/src/svg/qt_attribution.json index 9b17698..f0fc05c 100644 --- a/src/svg/qt_attribution.json +++ b/src/svg/qt_attribution.json @@ -3,7 +3,7 @@ "Name": "XSVG", "QDocModule": "qtsvg", "QtUsage": "Used in the Qt SVG library.", - "Files": "qtsvghandler.cpp", + "Files": "qsvghandler.cpp", "Description": "Some code for arc handling is derived from code from the XSVG project.", "License": "Historical Permission Notice and Disclaimer - sell variant", |