Qt 6.5.10-lts release Conflicts solved: dependencies.yaml Change-Id: I30aa1cd656455861044ba1c3c8075f52d20dc2e8
Qt 6.5.7-lts release Conflicts solved: dependencies.yaml Change-Id: I8fbe9c1606825b726adf95e69a4fa86e2196f4e8
The container reorders the content model items after component completion. The content model can be assigned as a model to the item views to visualise through a container content item. The content item can have item views anywhere in the object hierarchy. If the item views are somewhere down in the line and not at the top, there is a chance during component completion that some of the items are reparented to the item views, and others are with the container content item itself. Thus, reordering at this stage (having partial items) can lead to changing the order of elements within the content model, which further causes repositioning of items within the item views. This patch resolves this issue by skipping reordering the content model, if any of the items are not reparented to the item views. Fixes: QTBUG-138490 Change-Id: I1673e600774e2821653542c003d2d573f62d024d Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 0d1730681dd2cd6ef0638c94d7bddf9e22bd37e0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9b25239d7f2b0a7c85bee7e0520888f71bc7e8aa) (cherry picked from commit dfa694cca0ac64494749f44e198ed09c14512c58) (cherry picked from commit f04c0d65fbefedb9c4a8fc86dc23ba9e6d5cebc6)
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>
The typical use case for SwipeView is that the user declares items directly as children. Those children are added to its QQmlObjectModel, which are then used as the delegates for its ListView. ListView culls the items it manages, but in the case of a zero-sized view, those that are outside the view - and hence not in its visibleItems list - are not its responsibility. That responsibility instead falls to QQuickContainer. It's also necessary to clear and return early in QQuickItemViewPrivate::layout if the size of the view is zero, otherwise the tests that check if a valid-sized view is made zero-sized fail. Add a new C++-based test for Container which is only run with the Basic style (similar to e.g. tst_qquickmenubar) so that we can check the culled member of QQuickItemPrivate. tst_container.qml is run with all styles (even though it probably doesn't need to be, but it would also be difficult to rewrite in C++, even though it's fairly small). Fix some tests that were using zero-sized views. Fixes: QTBUG-125416 Change-Id: Ia05791b69568d51bea310e4f09266645ca2f1829 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 477c15def834bd49553c00b90f3a2006456ea931) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 0b6fd253e64519144808c02f161d2166198e4158) (cherry picked from commit add0731317f81a0e71535af0be94ddb1cca695de)
QQuickContainerPrivate::itemDestroyed did not properly clean up its internal data structures to have no references to the item that got destroyed. This was mainly because the call to q->isContent(item) in QQuickContainerPrivate::removeItem() would return false, so it would not continue doing the rest of the required cleanup that removeItem does, and it was therefore leaving dangling pointers to the destroyed item in QQuickContainers data structures. Fixes: QTBUG-118397 Change-Id: I7f23b4f98df33d69b42455d20016adb7e132b510 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 47b4037ccca3d9d38c2d172bafdeb5dcce699eb7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a2de295be30a471cf904c7f68f9acbbf71a6fd83)
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>
Task-number: QTBUG-115766 Change-Id: Id57bd53dbcccc107d57fd866a6c69f51b4303bc3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 542687a2088276748e13ea38e188b17489823716) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit e60840d4afee8d73083f81caefd53389d20d45fc)
Work on this was already started for the documentation in 1abdfe5d5a052f2298b7bf657513dfa7e0c66a56. The CMake target (docs_QuickControls2) probably can't be renamed until we rename the library, which won't happen until Qt 7. Task-number: QTBUG-95413 Change-Id: Ied20805a91286436606577c3de39671a447f27dd Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Qt Quick Controls 2 was named that way because it was a follow-up to Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer supported, we don't need to have "2" in the name. Work on this was already started for the documentation in 1abdfe5d5a052f2298b7bf657513dfa7e0c66a56. By doing this renaming a few weeks before feature freeze, it won't affect the release but still results in as little time possible spent manually fixing conflicts in cherry-picks from non-LTS releases as a result of the renaming. This patch does the following: - Renames directories. - Adapts CMakeLists.txt and other files to account for the new paths. A follow-up patch will handle documentation. It does not touch library names or other user-facing stuff, as that will have to be done in Qt 7. Task-number: QTBUG-95413 Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>