diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-30 21:45:29 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-30 21:45:29 +0200 |
| commit | a78a36d69a792ae66fc062e461b83c28152a6856 (patch) | |
| tree | ee81d342b96aa954ba8e08d1053ef9b1899052fa | |
| parent | 95b3eacef4d36be3d76d4c580f8170b1256d01a2 (diff) | |
| parent | 44da00e46a4a2329927f7f6e1d2e58d1fbd8ba87 (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: I3786300f9f3e1544dafbe43c406f0dcc022aab8f
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | configure.cmake | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.cmake.conf b/.cmake.conf index 842b347ce..7733def21 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 3cc34f3b8..b7ad2645b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.2.11 +MODULE_VERSION = 6.2.12 diff --git a/configure.cmake b/configure.cmake index 67dfa0193..92351d883 100644 --- a/configure.cmake +++ b/configure.cmake @@ -105,7 +105,7 @@ qt_feature("qtplugininfo" PRIVATE ) qt_feature("windeployqt" PRIVATE LABEL "Windows deployment tool" - PURPOSE "The Windows deployment tool is designed to automate the process of creating a deployable folder containing the Qt-related dependencies (libraries, QML imports, plugins, and translations) required to run the application from that folder. It creates a sandbox for Universal Windows Platform (UWP) or an installation tree for Windows desktop applications, which can be easily bundled into an installation package." + PURPOSE "The Windows deployment tool is designed to automate the process of creating a deployable folder containing the Qt-related dependencies (libraries, QML imports, plugins, and translations) required to run the application from that folder. The folder can be easily bundled into an installation package." CONDITION WIN32 ) qt_configure_add_summary_section(NAME "Qt Tools") diff --git a/dependencies.yaml b/dependencies.yaml index 532385611..239f11bbf 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -6,5 +6,5 @@ dependencies: ref: 3a82051eade32b34c2f4f6f652a9d8ef0db96c71 required: true ../tqtc-qtdeclarative: - ref: d8a396b76168b66b8cd938f61d8d958ebdb14871 + ref: a7c766a9863605eb81e8f0cdb4d2b93e087b5bde required: false |