qt/qtdeclarative.git/src/labs/settings/qqmlsettings.cpp, branch 6.5 Qt Declarative (Quick 2) Merge tag 'v6.5.10-lts' into tqtc/lts-6.5-opensource 2026-08-20T12:41:16+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2026-08-20T12:41:16+00:00 ae5bbc665633ea99eb26800eb5a8978d2213a2c2 Qt 6.5.10-lts release Conflicts solved: dependencies.yaml Change-Id: I30aa1cd656455861044ba1c3c8075f52d20dc2e8 
Qt 6.5.10-lts release

Conflicts solved:
	dependencies.yaml

Change-Id: I30aa1cd656455861044ba1c3c8075f52d20dc2e8
QQmlSettings: Avoid ODR violation between Core and Labs 2025-05-27T09:30:34+00:00 Fabian Kosmale fabian.kosmale@qt.io 2025-03-24T08:40:51+00:00 aa35868ff7b3b6979b54b114125ce5fe60192411 We don't explicitly link against both, which avoids C++ level UB. But if the class name is exactly the same, the metatype system is unable to discern them. That in turn means that the meta-type based valiadion code in QML breaks. Fixes: QTBUG-135039 Change-Id: Ib9c92511fd8eb7de9dcbef2c997b45cf76572a08 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 064ea3c496699f5e4c04db03c6743faae67b97a1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d918cd2dc4ba246108fa65914dbb0b8a17900eff) (cherry picked from commit b8c924bb4b63fdc8612e54f0d816e0ba56cb5dc6) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
We don't explicitly link against both, which avoids C++ level UB. But
if the class name is exactly the same, the metatype system is unable to
discern them. That in turn means that the meta-type based valiadion code
in QML breaks.

Fixes: QTBUG-135039
Change-Id: Ib9c92511fd8eb7de9dcbef2c997b45cf76572a08
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 064ea3c496699f5e4c04db03c6743faae67b97a1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit d918cd2dc4ba246108fa65914dbb0b8a17900eff)
(cherry picked from commit b8c924bb4b63fdc8612e54f0d816e0ba56cb5dc6)
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Revert "Update commercial SPDX-License-Identifier" 2025-01-03T17:25:16+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2025-01-03T05:44:42+00:00 eee1fcc18b8460f5aa581cc4e41db3ed8ec78fbb This reverts commit da5933f22c00270ac9083a089686e5c54e0057da. Revert of commercial SPDX license identifiers is required for the Qt 6.5.x opensource releases, Qt 6.5.4 onwards. Change-Id: Ic056fb761f242af0ec4c883ecb35d50804c1c67c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
This reverts commit da5933f22c00270ac9083a089686e5c54e0057da.

Revert of commercial SPDX license identifiers is required for the
Qt 6.5.x opensource releases, Qt 6.5.4 onwards.

Change-Id: Ic056fb761f242af0ec4c883ecb35d50804c1c67c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Update commercial SPDX-License-Identifier 2023-10-23T09:34:14+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2023-10-19T18:47:43+00:00 da5933f22c00270ac9083a089686e5c54e0057da Updated the commercial SPDX-License-Identifier to the files in tqtc-qtdeclarative. Examples, tests, or documentation files were not updated. Task-number: QTQAINFRA-5900 Change-Id: I74e2ac15b270b503edc80369b126913dd2ec33e1 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
Updated the commercial SPDX-License-Identifier to
the files in tqtc-qtdeclarative. Examples, tests, or
documentation files were not updated.

Task-number: QTQAINFRA-5900
Change-Id: I74e2ac15b270b503edc80369b126913dd2ec33e1
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Doc: Fix linking to QtCore.Settings QML type 2023-07-05T14:52:11+00:00 Topi Reinio topi.reinio@qt.io 2023-07-04T10:49:04+00:00 db6c4effdbc5f46f1fd64b2c1a8edf3e59dc5c51 Fixes QDoc warnings: Can't link to 'QtQmlCore::Settings'. Change-Id: I3e34a5a3f3a360391f3d1fbb00b17f617d02dc72 Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> Reviewed-by: Safiyyah Moosa <safiyyah.moosa@qt.io> (cherry picked from commit 87115131e7444259cf118dbc86be914b66a1d1b7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Fixes QDoc warnings: Can't link to 'QtQmlCore::Settings'.

Change-Id: I3e34a5a3f3a360391f3d1fbb00b17f617d02dc72
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
Reviewed-by: Safiyyah Moosa <safiyyah.moosa@qt.io>
(cherry picked from commit 87115131e7444259cf118dbc86be914b66a1d1b7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Docs: Fix "Can't link to" example warnings 2023-05-11T15:52:51+00:00 Safiyyah Moosa safiyyah.moosa@qt.io 2023-05-09T09:40:37+00:00 cb87f9b5340385d01e5ad83f01980e28551989ff Task-number: QTBUG-113160 Change-Id: If79cfc61ee610f382a071d4a922ba5b73ae1391c Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 2b7401160681fb403ec3d33c491093cce8b64b6d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Task-number: QTBUG-113160
Change-Id: If79cfc61ee610f382a071d4a922ba5b73ae1391c
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 2b7401160681fb403ec3d33c491093cce8b64b6d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Doc: Fix linking and import statement for Qt QML Core module 2023-02-22T03:25:41+00:00 Topi Reinio topi.reinio@qt.io 2023-02-20T20:12:32+00:00 092ba09a8c95e4f6362ef338d5c10784e3bde75d The QML module name is 'QtCore'. Use versionless import statement on the reference pages. Fixes: QTBUG-110914 Change-Id: If0f94fe9b48f80b2a6ea19b4f20a41d7b21a2383 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 481f034d1c98337557c2bc8d121213f9b441ba7f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
The QML module name is 'QtCore'. Use versionless import statement
on the reference pages.

Fixes: QTBUG-110914
Change-Id: If0f94fe9b48f80b2a6ea19b4f20a41d7b21a2383
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 481f034d1c98337557c2bc8d121213f9b441ba7f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Move Settings out of Qt.labs module 2022-09-29T13:31:17+00:00 Yuhang Zhao 2546789017@qq.com 2022-08-24T07:25:36+00:00 e7c1fec763f3113b45e2b3b9b67392cbd06cb37c Move Settings from the Qt.labs module to the QtCore module. And deprecate the original one in Qt.labs. Also changed the fileName(QString) property to location(QUrl) to better fit the Qt API. Adjust the tests accordingly. Task-number: QTBUG-92806 Change-Id: I1cbad1315383a9f2963583fd4d00cf3612f99f1e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
Move Settings from the Qt.labs module to the QtCore module.
And deprecate the original one in Qt.labs.

Also changed the fileName(QString) property to location(QUrl)
to better fit the Qt API.

Adjust the tests accordingly.

Task-number: QTBUG-92806
Change-Id: I1cbad1315383a9f2963583fd4d00cf3612f99f1e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Use SPDX license identifiers 2022-06-11T06:05:15+00:00 Lucie Gérard lucie.gerard@qt.io 2022-05-13T13:12:05+00:00 0dc4fd240a2897c5c443a0ef6d84c416843e4938 Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
Files that have to be modified by hand are modified.
License files are organized under LICENSES directory.

Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Rename "Basic Types" to "Value Types" 2022-01-21T00:23:59+00:00 Ulf Hermann ulf.hermann@qt.io 2022-01-12T10:54:57+00:00 712b637b581fb4e9bbf5b09f6a048b625e4d28ea Internally they've been called "value types" all along. Now that we are adding the ability to define your own value types the "basic" name is not really fitting anymore. Value types can be quite complex. Change-Id: I5fb4abec1dd2f0bbf7fb7f08b02db0882490e983 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
Internally they've been called "value types" all along. Now that we are
adding the ability to define your own value types the "basic" name is
not really fitting anymore. Value types can be quite complex.

Change-Id: I5fb4abec1dd2f0bbf7fb7f08b02db0882490e983
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>