aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'v6.5.8-lts-lgpl' into 6.56.5Tarja Sundqvist8 days76-297/+785
|\ | | | | | | Qt 6.5.8-lts-lgpl release
| * Merge tag 'v6.5.8-lts' into tqtc/lts-6.5-opensourcev6.5.8-lts-lgplTarja Sundqvist2025-12-0376-297/+785
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Qt 6.5.8-lts release Conflicts solved: dependencies.yaml Change-Id: Id2eeb915139bdd1943ffc498173db540f22ca2f3
| | * QQuickWidget: resize offscreen window before its content itemVolker Hilsheimer2024-11-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overlays are positioned so that they are centered over the content item within the window. If the window has a null-size when this is computed, then the overlay ends up being misplaced, and overlay-provided services, such as modality or closing popups, stops working for parts of the UI. Fix this by resizing the offscreen window before resizing the content item. Add a second test case that verifies that the overlay geometry is as it should be, both after the initial show, and after resizing the widget. The existing resizeOverlay test doesn't use a proper QQuickOverlay, so it doesn't cover all the relevant code. Adjustment for 6.5: the test case fails for SizeViewToRootObject in 6.5 as the overlay does not follow the size of the content item in that version. Mark that as an expected failure. Fixes: QTBUG-125135 Task-number: QTBUG-115536 Change-Id: I682d87f07051d213d3bd58c1c2533c84b50a3139 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit f71ef0d8b8d25b80833228fe4e4bfa716bceb398) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9c0aa4cbb7fb50804ce4d1fd1841c49b2866a7af)
| | * Doc: add "Hiding Delegates" section to ListView's docsMitch Curtis2024-11-282-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comes up often online, so let's document the official advice. Change-Id: I926326bc3b033d38746a508e5c448b5b055effeb Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit e7286e3f5fcabc921fc794f7099c9da4e8ceb01b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c4d8cbe292d3662067b959861c14f3cf8bdfa454)
| | * Doc: add "Avoid Storing State in Delegates" section to ListView's docsMitch Curtis2024-11-284-3/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mentioned in a couple of places, so add a dedicated section and link to it. Also add a section to the Qt Quick best practices page. Change-Id: I0ba528e6c37b0c9c82ca1847817251f176b7f978 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 473fc5005e2811347f00679e56e90ec0915f8041) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 5da227d5681f7d0e4e0ca6f0c3f626487c191e98)
| | * MouseArea: don't enter pressed state while invisibleShawn Rutledge2024-11-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-128577 Change-Id: Ib6d97450e8aa6e55531ff5a20d86105e4f2db565 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit c36c6881c703639ada2342b160b405474b7f57c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit ef1dc2a9ca1997b01acc4f5c70756cef6d3db1ab) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * Modify the Listview snippet to fix Unqualified access warningsMate Barany2024-11-191-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probably has not been updated for a while now, copy pasting and running the example leads to unqualified access warnings. https://doc.qt.io/qt-6/qtquick-modelviewsdata-modelview.html "In most cases you should use required properties to pass model data into your delegates." Fix the snippet by using required properties. Change-Id: I4a46f1ff29712238dd22bf4455a6674d8bdc0f49 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit 13da0d8133fefba2564dfa014020dd1c968bf0f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 926993500dc7d07dc65f194d02c6b52304189b08)
| | * QtQml: Fix regular expressions with multiple matchesUlf Hermann2024-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to match the next capture one character past the last one, not at the same place. Otherwise we match the same thing again. Fixes: QTBUG-130974 Change-Id: Ifc1cf7c95c7777ba7140f141b26455e155db73db Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> (cherry picked from commit 9d9413f3d3983b1d24fd878da14eed153e83cbaa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9156754ab226934f248dea90d7b256e1abf8c2f4)
| | * Emit pointChanged when entering mouseArea; improve testSami Varanka2024-11-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MouseArea didn't emit pointChanged when entering mouseArea. Now tst_QQuickMouseArea::hoverPosition() expects mouseX, mouseY and pointChanged signals to be emitted when the mouse enters. Also stopped depending on root properties in the test: there's nothing wrong with checking MouseArea using its own API, in its own autotest where we have the #include. Fixes: QTBUG-127122 Change-Id: I76ee3160ebc2970f8ddd20a4fc531a4d6a16a50b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 49308d5d048a8d7bcf1557db0fd6ccf1460fa042) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d6c5a31136d4d0d213ac6a3a4fa069ab410b523b)
| | * Doc: fix ComboBox customization exampleMitch Curtis2024-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90a0d4023206cfeed1bec43cb11e026ff0379d3d changed the height calculation of ComboBox's popup, but forgot to update the customization docs. This fixes the popup not being scrollable when it exceeds the height of the window. Change-Id: I822888c3d979d06c21cd7ca081dae48115bb375e Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 9c72d7f3dcf5179975edf759173bca5d46f566c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit e81d4be523eaca2f3ad075a61d00f94d21cdf17b)
| | * QQuickVisualTestUtils::compareImages: fail if image depth is not 32Mitch Curtis2024-11-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function would ignore the depth and read memory that it shouldn't, which can cause hard-to-diagnose failures, and heap-buffer-overflows when ASAN is enabled. Mismatches in depth can happen when optimizing images with optipng, for example, which may convert color images to grayscale. compareImages was added in 7ffea4048321b86402a9ded5255ad16ac74d0518. Change-Id: Id83dcd79ae94088996ff770d90b2c1add910fb1b Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit a5412bece857c5e2742a9cc2dc2e65539416a17b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 978213a20472911ff77eac71dd4748ee09943754)
| | * CustomParser: Fix enum handlingFabian Kosmale2024-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have an import namespace, QQmlTypeNameCache::isValid will always return true; what we want to check instead is whether the type is valid, or whether we need to query the namespace. Amends a363aa3df44da399d2aeb8785608501eae50e600. Fixes: QTBUG-118879 Change-Id: Iaa9db015979c9454662c6fbcd691dbfb03a3d053 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit cfd7198d167b1208cb351ec907e59fa85ca59ba4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 45d532b788fd0df2c462fed110f50158d8b7a3fb) Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
| | * MessageDialog: Fix the background color of detailed text in Dark modeJan Arve Sæther2024-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The detailed text background was hardcoded to a light color. This of course didn't work well in Dark mode, and caused text (light foreground color) to be unreadable on the light background color. Task-number: QTBUG-123764 Change-Id: I95801d865de880e62059be37cfaad0cf8efa6ab5 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 2aed62bd272295985b77103992669b1c5406e03e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d49fde914956c575a87ea616f283c763eb7e16b9)
| | * Don't block press and release events for non-popup children of overlayOliver Eftevaag2024-11-122-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to position items above an active popup, users will typically have to reparent those items to the overlay. But doing so, can break input handling when using modal popups. Since childMouseEventFilter will cause the overlay to filter events, sent to it's children, and modal popups assumes it's unsafe to not block those events if the target item doesn't belong to itself. It appears the assumption is that only popup items (and dimmers) will be parented to the overlay, but in reality, any item can, by assigning the parent to be `Overlay.overlay`. If the item is rendered above a modal popup, then maybe that popup shouldn't filter the event, similar to the exception it makes for its own child items. Task-number: QTBUG-129520 Fixes: QTBUG-130331 Change-Id: Id7b69570eb6598d1ef030e0b7230489046444e45 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 01de98703916ef485f8934485270478b90a524f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit de48b440c5fd078f4a680b9d3c7074769235d2d0) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * Doc: Make note about setting MouseArea::cursorShape to undefinedAndreas Eliasson2024-11-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the cursorShape property to undefined, the MouseArea will not change the cursor from its existing shape when entering it. Let users know about this. Fixes: QTBUG-124533 Pick-to: 6.2 Change-Id: I78cb3f8a7ffdfdd9f9504314bced20b46ec319c0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 555fda57e479672cde07d22622ce4d79d2292c19) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f7aceb6ee9e33312a29360cafe1ca1d7e8ad1e57)
| | * QtQuick: Do not expose a replace() method for QQuickWindow::dataUlf Hermann2024-11-092-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickWindow's data is backed by its content item's data and QQuickItem does not support replace() because it's not actually a list. Amends commit 7e1988539983531ecce589d76479f5bbe9bdb9b6. Fixes: QTBUG-130856 Change-Id: I27dbf3666d9c40389ebf5b0259ee343868194c89 Reviewed-by: Semih Yavuz <semih.yavuz@qt.io> Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io> (cherry picked from commit e156157dddd7166bc3d367d1c262256351377056) (cherry picked from commit 8f41e206856520671cc92e77b67c3ca42e03953b)
| | * QQmlComponent: Fix ordering of callbacks on loadFromModule()Ulf Hermann2024-11-094-39/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to set any initial properties before we call componentComplete() and we should assign a context to the object even if it's loaded from a C++-based type. It can be the engine's root context in that case. Amends commit fa0be265e4c6a8528778a41fdd376b26cb70db74. [ChangeLog][QtQml] The QQmlParserStatus callbacks are invoked on objects loaded using QQmlComponent::loadFromModule() at appropriate times now. You can rely on any initial properties having been set before componentComplete() is called and you can rely on the object having a valid QML context. Fixes: QTBUG-130867 Change-Id: I3485a4305a583ce3cab7d83d8305503025004f44 Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io> (cherry picked from commit 595abf24a2c9d8a3679a2c6c4e941c0e301b8ea0) (cherry picked from commit 3c162c592a815dd57405327888a2f27cc28ce498) Reviewed-by: Semih Yavuz <semih.yavuz@qt.io>
| | * Don't propagate mouse event for menu configured inside popupSanthosh Kumar2024-11-082-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch e4a159632ec39542ec23567963191162f9dcdfef fixes propagating mouse events by not allowing it to the underlying items beneath the overlay. It still can cause an issue when the menu is nested within the popup. This is because the menu doesn't block the input, which allows the overlay to pass on the events to the next child item. This patch enables the menu to consume the mouse press event (as similar to the drawer), further causing overlay not to pass on the events to the other child items. Fixes: QTBUG-130536 Change-Id: I1014c692a4a5aed22e096a79c06e27cb26fea70d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 9fd43c27d19e675a0f5efdda4ea53fa97f61f852) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a5a54c083bbe8506a2f16ab8a411d3c8689c31d6)
| | * Doc: Fix typo in Quick enumeration value namePaul Wicking2024-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-130820 Change-Id: I5f1bba26024cc7f8d81b04147751f8e30feefc6c Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> (cherry picked from commit 07ebdaf11dbb39a02b271501bf1a5a0f91991c5a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 3634ee55c1acf408008fde7d5481cf751cbd11e3)
| | * Fix readOnly textEdits getting tabFocus on macOSDoris Verria2024-11-041-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On macOS, readOnly/non-editable text controls don't accept tab focus. This behavior is also respected in Qt since c1d2bcff3dededa5b560713f4fd4874a023c43a2 . Since this behavior is particular to macOS and not to other platforms, in Qt we have tabFocusBehavior() in qGuiApp->styleHints() which represents the system setting. For all platforms other than macOS this always returns Qt::TabFocusAllControls, which hints that all enabled controls should receive tab focus no matter if editable or not. On macOS if this true, all controls will accept tab focus, and if not, it means that only editable text inputs and lists will. The problem was that on macOS readOnly text edits were receivng tab focus even if tabFocusBehaviour was not Qt::TabFocusAllControls. This was because they have an EditableText accessible role, which took precedence over their editable status. To fix, if tabFocusBehaviour allows, non-editable/readOnly properties should not receive tab focus no matter the accessible role. While at it, move the tabFocusBehaviour check inside QQuickItem::canAcceptTabFocus. Remove expect_fail in test covering case. Note that this patch assumes that if tabFocusBehaviour == Qt::TabFocusAllControls readOnly text inputs will receive tab focus on macOS too, even if this is never the case on a native application: such inputs never get tab focus on Mac. We could introduce a new enum value for tabFocusBehaviour that more accurately depicts the readOnly text input focus behavior. Change-Id: I098f75eb118b04f73dae3deec0c798f18870a202 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit aa7eb60a703cdc076115a45c2ac39e4965da2b87) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2a0e0fac0ff6672431d6b2e6dc5bc81d27e0ae85)
| | * QtQml: Wake type loader thread on engine shutdown if necessaryUlf Hermann2024-11-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the type loader thread is waiting for the main thread to process a message, we cannot shut it down without waking it first. However, having locked the mutex, we can detect this situation by exemining the mainSync member. If that is set, wake the type loader thread one last time. It will then have the opportunity to see the isShutdown flag we've just set and dutifully shut itself down. Amends commit 73b2e33d7854618b881aff9a8230cce24ce7d7f9 Fixes: QTBUG-128269 Change-Id: I8bf897010972de5e40e717846f3ff106e040dbe6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 2296fad08d2d2db74e26bc7e5f339a21800f581a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 998641d0ea8a188238e07fa93744d3de33b4f43b)
| | * Doc: Fix typoUlf Hermann2024-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module QQuickItem belongs to is called "QtQuick", not only "Quick". Amends commit 920745223d1c1ff401e3083327fcd88d8461ebc0. Change-Id: Ifd7c1c50551793ecee7c620f9f8aac2a37a518cb Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit bb00c712833e2983d9367f7070bbff500d977fa4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit cf126b32aa6f72d51a6e2a1d62de1a92cabd21fc)
| | * PinchHandler: Set target properties only if respective axis enabledVladimir Belyavsky2024-11-011-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user has disabled the rotation or scale axis, the target item's rotation or scale property must not be set at all, to avoid breaking bindings that were set differently. Fixes: QTBUG-130517 Change-Id: I8f84f6845532f748bbdcc3af91a398d6659156ca Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 49fbf2f86afa62b8c1c2be330620a0b310584a34) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 6c9123f0933f476a2fd4a8bf4b9c01b36ff56d0f)
| | * Doc: Add source string template code snippet for qsTrIdAndreas Eliasson2024-11-012-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add code snippet for how to supply source string templates to Qt::qsTrId using /*% <string> */. The /begincomment and /endcomment expand to /* and */, respectively. Fixes: QTBUG-127794 Pick-to: 6.2 Change-Id: I84b77179892eea6dba2c8816b658916d665e718e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 00a4a181411cb1198a5a0f4fb6d40db2f6f787ed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 460b3d02e2aa9197c7132d8bdf70d18ccd025289)
| | * QQuickScreenInfo: make sure we handle the wrapped screen changesVladimir Belyavsky2024-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickScreenInfo is created every time we access the Window's `screen` property. See QQuickWindowQmlImpl::screen(). However, it didn't handle any changes to the screen passed to the constructor. Therefore, any bindings to the internal properties of the Window's screen didn't work correctly either. Fix this by calling setWrappedScreen() directly from the constructor to ensure that we handle all changes to the wrapped platform's screen. Fixes: QTBUG-130689 Change-Id: I92337169c12c2c294ee00af45f3885f53b5e6588 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 00f58f2eca6bfcc66dcc79c249e51d2d34eb6a11) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9512dad108c22356708007fbb7f2eb285676df86)
| | * Return window title for QAccessible::Name onlyMorten Sørvig2024-10-291-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAccessibleQuickWindow::text() was returning the window title for all QAccessible::Text enum values, including QAccessible::Accelerator. This caused Windows Narrator to read the window title twice: once for Name and once for Accelerator. Fix this by returning the window title for QAccessible::Name only. Fixes: QTBUG-119530 Pick-to: 5.15 Change-Id: I3c51056670281158ef65dfebc83abe293bb20dd9 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> (cherry picked from commit 6ee7100b16fa7aa0902a1b8e89f8fbc03427aeb9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 6e99d7c3e06023a94a3c1392ce501478d161d148)
| | * QQuickItemView: fix crash with zero-size SwipeView that uses RepeaterMitch Curtis2024-10-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running the minimal example from the bug report, the order of events is: 1. deletables are iterated in QQuickRepeater::clear(), and deleteLater is called on the delegate item. 2. deletables are unparented. This causes Container (SwipeView) to be notified of the parent change and it removes the item. Part of this involves changing the currentIndex, since the removed item was current. 3. SwipeView's contentItem (ListView) has its currentIndex bound to the container's, so QQuickItemView::setCurrentIndex is called. 4. setCurrentIndex calls updateCurrent, which detects that the currentIndex (which is -1, because there was only one item) is out of range and so releases the item. This causes it to be added to unrequestedItems, even though it has been scheduled for deletion. This patch makes QQuickItemView detect that the item is going to be deleted and not add it to the list of deletables. Fixes: QTBUG-129622 Change-Id: I999aedbdfafc61ff6d33eb6579331f470e9c1454 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 18a6a658aaf25fa8c380daef8a72dee4c1661164) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 861a7921ed7833a90f77b5fca436c789a4f9517c)
| | * Continue scrolling Flickable past start or end of nested FlickableDilek Akcay2024-10-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can continue scrolling the main list with the mouse wheel even after reaching the end of the nested list. When using a trackpad, behavior is now the same. Added tst_qquickflickable::nestedSameDirectionTrackpad. nestedSameDirection.qml or the example from QTBUG-126514 is suitable for manual testing. Since we add a custom QPointingDevice to simulate a trackpad, use it in nestedTrackpad() too, for better realism. Fixes: QTBUG-124478 Change-Id: I9b9c9a41afcfa5d950093a31682013ae9e917f1a Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 6d921e2d0ec6bec154ee03bbf70b882117bfcb2d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit e1121fb1a072c2f2454addf1412390603580f553)
| | * Doc: add more internal documentation for deferred executionMitch Curtis2024-10-251-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives background information and a brief summary of why deferred execution exists. Change-Id: I991d9ffd175d781d286f855404b767d652fa6c84 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 66008a31db41391aefe9436d1f5d15870457839b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 953a05bffcfa35b18982186f3a344c2ffc8c53f1)
| | * Doc: improve FileDialog's detailed descriptionMitch Curtis2024-10-221-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace mention of deprecated currentFile(s) with selectedFile(s). - Mention currentFolder. Change-Id: Ib7a414cba7a6f8e479159afc9ed50b014f93442c Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 200d38a9b9561bba646bb8a61f8dc48b99ed6596) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 17efc95bbffed2a2e132a9ddff490de626f938ac)
| | * QtQml: Faithfully preserve UNC paths when locating qmldirsUlf Hermann2024-10-221-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paths can contain various interesting characters that need to be specially encoded in URLs. Therefore, when funneling the path through QUrl in order to normalize it, retrieve a path again in the end. Do not just stringify the URL. Amends commit e0400d08755bb40c303bbe330bc3bd6045436c22 Pick-to: 6.2 Fixes: QTBUG-129681 Change-Id: Ief49ce08acb3d346655abaf34278cf7c6afd107e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io> (cherry picked from commit a24baed01a0f2cdda37f3eb9a406cb2fa94da4cb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit ec00e10458f42c31b136b06ce14b29f81eafda0e)
| | * QtQml: Correctly call type getters on namespaces for AOT codeUlf Hermann2024-10-211-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this makes no difference in practice, it was technically undefined behavior before. You cannot call the object getter through the interface of the context getter. Amends commit 20d413aaac3e2edd8859b7325805d8fbd35d28e3. Change-Id: Iab15d4b05a18aa1997e1e0a45aa9df19adf283df Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> (cherry picked from commit adc90d3c15f80011c8c737440ff8593c27b4a711) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 1268040ce2d07b0e1d645f96dfceec57158bff51)
| | * QQmlProperty: Don't clear toplevel binding bit for value type bindingsUlf Hermann2024-10-211-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we remove a value type binding from a proxy binding, the proxy binding is still there. We must not clear the toplevel binding bit then. Amends commit c9d7620bc2e47d3e1b84f824eb5b643f269f4a56 Pick-to: 6.2 Fixes: QTBUG-130143 Change-Id: Ie4f1ba4a22a1e15eaa218fb8e72f78964ae8cf75 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit cdcfed60e12a0ba386287c8bdd96736c6a639b7a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit e1cfc24d39b0e199f60e864c78dd7476f01d1cd1)
| | * QtQml: Make QQmlComponent drop its TypeData on the type loader threadUlf Hermann2024-10-215-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must not delete a QQmlTypeData on the main thread since it interacts with data on the type loader thread. If the type loader thread is still alive, we have to drop any QQmlDataBlobs there. Otherwise the type loader thread may crash when accessing a dangling pointer. Pick-to: 6.2 Task-number: QTBUG-128269 Change-Id: If4cfbd40caef8cc8ac5d96f41dd08631170191c5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 6396c5bf29cceab41f2adc211b1dec8b08eaa04e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 0a928061a0146a045e69287304c2832d26c8d5cd)
| | * Doc: clarify the uses of the Templates typesMitch Curtis2024-10-211-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-129850 Change-Id: I4a88b19672479a452facb0f1ca62e4fbb1d50203 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 6ce0dc45d254f48ecb3957df772167ea41510eaf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 5b392593a18154a105122c7f72954455769fcf47)
| | * Document delegateModel property of ComboBoxMitch Curtis2024-10-211-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was marked as internal but is necessary to implement a custom ComboBox, as demonstrated by the customization docs. Fixes: QTBUG-129759 Change-Id: Ieb53a49a022a1d237738217fc88dda7a630d31d2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 9ed04229a490b65d9cdf7b4b7af86b128e2b2499) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 6dc017a82cc9c7d547bf4bc2d8ee1b981d5b4cdd)
| | * Doc: import the Basic style in more customization examplesMitch Curtis2024-10-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A follow-up of e4577eb6bb9308d2b84bfe66216333b001ac670b. This ensures that the user won't inadvertently base the customizations on top of the native styles. Change-Id: Ibfeebfdb5ddad377947481deeb8de46976109daa Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit c71e8955f29a9e3778e1889e75f1a5aab611ecd0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 636fd5578ea0f9aa8ec7a9e52e4b559e55d934fd)
| | * QQuickItem: Correct coordinate conversion to QPointFWang Chuan2024-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QPointF instead of QPoint for accurate mapping of coordinates. Amends 317ae95bc1c8bc66fee2cb6335f7a12e2368dccc [ChangeLog][QQuickItem] The function mapToItem(item, real x, real y) now returns a point with real values instead of rounding to an integer. Fixes: QTBUG-119034 Change-Id: I2c11ec03bdc925c55f48f309f22083b754023cf0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 1f618ee52a4a4265c70ca848afacf9de11421e37) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 549f4f6f4732514664b964757223a2b6151bff48)
| | * QtQml: Protect value type lookupSetter() from identical COMDAT foldingUlf Hermann2024-10-181-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC thinks it can deviate from the standard and fold separate functions into the same code block even if their addresses are taken. This makes the addresses equal and breaks the lookup mechanism. We set up a dilemma for the compiler by explicitly comparing the function addresses and failing when they are equal. Now the new function has "different" code that will however be optimized away. Pick-to: 6.2 Task-number: QTBUG-128843 Change-Id: Id9512397fcbb238d880ee9966d8708fc576590c7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 097712ae79924837dd7ac02965475e152978133d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 7a8150c629585276ade3fe802f84f79301320661)
| | * QtQml: Protect lookupAttached() from identical COMDAT foldingUlf Hermann2024-10-181-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC thinks it can deviate from the standard and fold separate functions into the same code block even if their addresses are taken. This makes the addresses equal and breaks the lookup mechanism. We set up a dilemma for the compiler by explicitly comparing the function addresses and failing when they are equal. Now the new function has "different" code that will however be optimized away. Pick-to: 6.2 Fixes: QTBUG-128843 Change-Id: I42d9f764235b877c5c9e054502ea01a16369d27b Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io> (cherry picked from commit fa26df82d7793c0847996785d4137323c67226d2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 126b931c46f5754c157bec494f7f3bca9a8577bb)
| | * Replace mouse-only flick, moveAndPress, moveAndRelease in testsShawn Rutledge2024-10-172-49/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since d7623d79ef4bc9533fced027bf1d173d68b4eba6 Flickable has worked directly with touch events; and we are expected to have stylus devices (QTabletEvents) working well too. So we need to be able to expand the test coverage to more types of devices. This is the first step. The high-dpi scaling is from 0debcf3ed3f62416be1c172454f420119df0587e. Change-Id: I93a3a4b84424eb69e0cd7c9f4ebe58b9f27082d9 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 99c6706b9208fcdf2e48f14bcd3f961567838ea4) Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | * QQuickItem: consistently check the delivery agent pointerVolker Hilsheimer2024-10-161-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In paths that might be executed during destruction of items and shut-downs, check that the agent is not nullptr already. Reported crash is not reproducible in a test case, so no auto-test added. Fixes: QTBUG-129699 Change-Id: Ic913b125655aed57fdb3924e9a4b8754e8095c47 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 99a72a051376101a163ba96a50ee20491347038a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 76fe874d3f15ee25df29d3d855b1f33785e5a3f9)
| | * QQmlDelegateModel: fix delegates not being created in certain cases v2Mitch Curtis2024-10-121-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 837c2f18cd223707e7cedb213257b0158ea07146, we connect to modelAboutToBeReset rather than modelReset so that we can handle role name changes. _q_modelAboutToBeReset now connects modelReset to handleModelReset with a single shot connection instead. However, it's possible for user code to begin the reset before connectToAbstractItemModel is called (QTBUG-125053), in which case we connect to modelReset too late and handleModelReset is never called, resulting in delegates not being created in certain cases. So, we check at the earliest point we can if the model is in the process of being reset, and if so, connect modelReset to handleModelReset. This is a less intrusive alternative to 6561344dd2d1ba69abe6edec4fe340b256da9e13, which caused regressions and was reverted. Fixes: QTBUG-125053 Task-number: QTBUG-127340 Change-Id: I2bfe192ed61eddaa481de4b1e14b1fa5d07a51c1 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 4bb16ce2c8ea94f768991593a581c8838d48f3a3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2aefbca84d2f3dca2c2697f13710b6907c0c7e59)
| | * Revert "QQmlDelegateModel: fix delegates not being created in certain cases"Mitch Curtis2024-10-122-45/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6561344dd2d1ba69abe6edec4fe340b256da9e13. It needs to be fixed in a different way. Fixes: QTBUG-127340 Change-Id: I8503b22a5257e0fb5ee11a1bdf83d3dcab4a600a Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 281f620ceea03e7a222d796ae0cca917a9778368) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 3330731d0cb221477ab3d856db032126403ae6a0)
| | * ListView: fix countChanged not being emitted in certain casesMitch Curtis2024-10-112-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This broke after 477c15def834bd49553c00b90f3a2006456ea931. countChanged would have normally been emitted in the call to applyModelChanges that we skipped after adding the q->size().isNull() check. We can check hasPendingChanges() to know if a count change is pending (which is also the first thing applyModelChanges checks before doing its work), and if so, emit countChanged so that any bindings that are relying on it can function as expected. Fixes: QTBUG-129165 Change-Id: Ic045f1870b39d192f6880e23daab03fd73a16d58 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 0a1d8fb26d1e89c82a0d35dd728d7e928a94d197) (cherry picked from commit 101df5c2c00c198c22fc75478a7be4056bcf6222) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 8971dc7ab9713d8f36b414881b411b431aec2112)
| | * QtQml: Allow creating attachments from unregistered typesUlf Hermann2024-10-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can resolve the attached properties function without querying the type registry. The attached properties function can be resolved with pure C++, given it's surrounding type, name, and signature. We already have functionality to do so in qqmlprivate.h This is not only faster, but also avoids the problem of having to register dependent types before being able to use their attachments. Fixes: QTBUG-128895 Change-Id: I5c1df81a43195eb4dd97a4abfaa79f3cfe39355e Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io> (cherry picked from commit 18804f23df2ff43b26ef2317a16c67d8ea77d17e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 5cd35f8fdbf586c910b2f09cc6fac2a4816ec657)
| | * Use QPointer for QQuickPixmapData::specialDevice; abort if deletedShawn Rutledge2024-10-051-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickPdfPageImage::load() calls carrierFile() to get a QPdfFile instance, a subclass of QIODevice, and calls QQuickPixmap::loadImageFromDevice() which saves the device to QQuickPixmapData::specialDevice, then calls QQuickPixmapReader::startJob() which sends a ProcessJobs event. The worker thread handles it in QQuickPixmapReader::processJob() and calls readImage(), passing a simple QIODevice *dev. readImage() relies on that pointer being valid until the work is done. However, QQuickPdfDocument::setSource() may have called deleteLater(). We can detect it, and in that case there is no point in continuing this render job. Fixes: QTBUG-128875 Change-Id: I1e8bf526c5596ce561d7bf4f7dea8d50f3c0eb18 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit c28fa0f768d512ca52dfd44249a19e99f55427db) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 65b4530b31b23d65ee90a51f53a0aa051add1b3b) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Doc: Change description for QQuickWindow::graphicsConfiguration()Andreas Eliasson2024-10-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems the current description has been copied from QQuickWindow::graphicsDevice(). Fixes: QTBUG-126784 Pick-to: 6.2 Change-Id: Ia52a6f7cd8e082e07b8cc8d59c345d4e2508aa19 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit de22477708ed3700d2f36d0121008b1cac4b837e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 8f2b6d92c8e9fd81db4047d8e0ac2128489b8aa6)
| | * Fix BusyIndicator being hidden when running is changed quicklyMitch Curtis2024-10-036-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If running is set to false and then true within a short period, BusyIndicatorImpl's OpacityAnimator cancels the 1 => 0 animation (which was for running being set to false), setting opacity to 0 and hence visible to false. This happens _after_ setRunning(true) was called, because the properties were set synchronously but the animation is asynchronous. To account for this situation, we only hide ourselves if we're not running by storing and checking our running state. Fixes: QTBUG-85860 Change-Id: I220dfb78f00028e4a12a92fc14082006e1844002 Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 15b385af9f8e24e8c66588b55a3f7828d70d2c33) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 52016f3ae62637c18513ec0e9ad27fb916b0080c)
| | * Doc: Add link to qmlformat pageAndreas Eliasson2024-10-021-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid duplicated content, add a link to the qmlformat page. Having a link to a more detailed page for the tool is also in line with how the other tools are listed on the Qt Quick Tools and Utilities page. Fixes: QTBUG-127287 Change-Id: Id0fc71818bdb41fb5763dad7f2b562e4c3a00a4d Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit e71fbeddf5f9e76d0191df4465a211aee89e951a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 893fca0ad0a726aa043cee41bf0f3199533cc4c9)
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-23 10:02:15 +0000