qt/qtdeclarative.git/src/quickcontrolstestutils/dialogstestutils.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
tst_QQuickFile/FolderDialogImpl: use canonical paths 2025-06-19T02:48:28+00:00 Mitch Curtis mitch.curtis@qt.io 2025-06-06T03:44:57+00:00 89017b29eba1d553f36f1ff7385923cd42823197 This adapts to 7bd7df5aa170c240061144a9210a13b62949935c. The test was expecting e.g. this path: /var/folders/0r/vd385j117f949qnfm4h_539w0000gn/T/tst_qquickfiledialogimpl-dqvSBE/sub-dir But the actual path was this: /private/var/folders/0r/vd385j117f949qnfm4h_539w0000gn/T/tst_qquickfiledialogimpl-dqvSBE/sub-dir Fixes: QTBUG-137416 Change-Id: I31b929017ebb1a672a614f8b409dc5c4e8d5e000 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit b4e80edc64c884086f9b4b2d28346fbc14e0ebd9) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit a97b36e746723cc3796930d45aa4a143426e2024) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 82be04fafb56d05b0ed388e0687571dd0b35ed14) 
This adapts to 7bd7df5aa170c240061144a9210a13b62949935c.

The test was expecting e.g. this path:

/var/folders/0r/vd385j117f949qnfm4h_539w0000gn/T/tst_qquickfiledialogimpl-dqvSBE/sub-dir

But the actual path was this:

/private/var/folders/0r/vd385j117f949qnfm4h_539w0000gn/T/tst_qquickfiledialogimpl-dqvSBE/sub-dir

Fixes: QTBUG-137416
Change-Id: I31b929017ebb1a672a614f8b409dc5c4e8d5e000
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit b4e80edc64c884086f9b4b2d28346fbc14e0ebd9)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit a97b36e746723cc3796930d45aa4a143426e2024)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 82be04fafb56d05b0ed388e0687571dd0b35ed14)
Revert "Update commercial SPDX-License-Identifier" 2025-06-02T06:01:16+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2025-05-30T09:58:32+00:00 ab97288de27970ba3cb0300158df757c01dabd77 This reverts commit 6517e8df24d2381e951b9ec3e0cda2ae33edac37. Commercial SPDX license identifiers need to be removed from the opensource release. Change-Id: I60f8c76ace400db6182e012c8aae050d13d262e9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> 
This reverts commit 6517e8df24d2381e951b9ec3e0cda2ae33edac37.

Commercial SPDX license identifiers need to be removed from
the opensource release.

Change-Id: I60f8c76ace400db6182e012c8aae050d13d262e9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Update commercial SPDX-License-Identifier 2023-12-13T16:58:36+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2023-12-08T15:16:30+00:00 6517e8df24d2381e951b9ec3e0cda2ae33edac37 Some files in tqtc-qtdeclarative were missing the commercial SPDX-License-Identifier. Build files, examples, tests, or documentation are not updated. Task-number: QTQAINFRA-5900 Change-Id: I2cad9a7a271b0b3f3af3074259614b890b266a91 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 132fe2df41fc5e69fec39440b35137d5f0d63f6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Some files in tqtc-qtdeclarative were missing the commercial
SPDX-License-Identifier. Build files, examples, tests, or
documentation are not updated.

Task-number: QTQAINFRA-5900
Change-Id: I2cad9a7a271b0b3f3af3074259614b890b266a91
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 132fe2df41fc5e69fec39440b35137d5f0d63f6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Fix build with -no-feature-listview and itemviews 2023-04-13T07:39:10+00:00 Tasuku Suzuki tasuku.suzuki@signal-slot.co.jp 2023-04-13T01:51:13+00:00 4137fc0753e05e4671cc9b5eebd1d8c201b7d7fb tested with each/all of below -no-feature-gridview -no-feature-listview -no-feature-pathview -no-feature-tableview -no-feature-treeview Change-Id: I90cc7bc45bb9065000bc0fc7eeb8e80f02acb0d0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 922c89cf955f5703fca015f25e681cbcc783d580) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
tested with each/all of below
-no-feature-gridview
-no-feature-listview
-no-feature-pathview
-no-feature-tableview
-no-feature-treeview

Change-Id: I90cc7bc45bb9065000bc0fc7eeb8e80f02acb0d0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 922c89cf955f5703fca015f25e681cbcc783d580)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Fix flaky tst_QQuickFileDialogImpl::goUpIntoLargeFolder test 2022-09-08T14:46:55+00:00 Mitch Curtis mitch.curtis@qt.io 2022-09-07T09:43:41+00:00 f406385dfb9e88b3661f8524281b8f9d9e1351a7 Ensure that all expected delegates have loaded before trying to verify that the correct file is selected. This requires a modification to verifyFileDialogDelegates to account for the large amount of files that goUpIntoLargeFolder deals with, as QTest's failure message is limited to 1024 characters. Fixes: QTBUG-101488 Pick-to: 6.2 6.3 6.4 Change-Id: I65cf6ffc4724309083899dac2acc1f04a11a1220 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> 
Ensure that all expected delegates have loaded before trying
to verify that the correct file is selected.

This requires a modification to verifyFileDialogDelegates to
account for the large amount of files that
goUpIntoLargeFolder deals with, as QTest's failure message
is limited to 1024 characters.

Fixes: QTBUG-101488
Pick-to: 6.2 6.3 6.4
Change-Id: I65cf6ffc4724309083899dac2acc1f04a11a1220
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@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>
QtQuickTest: add API for checking for polish at window level 2022-06-02T04:46:11+00:00 Mitch Curtis mitch.curtis@qt.io 2021-06-19T09:30:54+00:00 36c6c1ea57ad503a2f42fe81a12d1254fcd38cca This adds a qIsPolishScheduled(QQuickWindow *) overload of qIsPolishScheduled(QQuickItem *) (added in 40d6072bc8a4df0fe1a16025fe30fe653463a446) and deprecates qWaitForItemPolished() (added in 7a3cad0619662b992154e075ec6b840bfc8a46a7) in favor of qWaitForPolish(), which has QQuickItem* and QQuickWindow* overloads. The existing functions that take QQuickItem are useful, but testing Qt Quick applications can be made even easier by allowing users to check if a window has any items that need to be polished. This information is already present (in QQuickWindowPrivate::itemsToPolish), so it's very efficient to check for. This is especially useful now that Qt Quick Layouts using polishing for their layouting, for example, as it's no longer necessary to find individual polishable items in complex hierarchies before proceeding to interact with child items. [ChangeLog][QtQuickTest][QQuickTest] Added QQuickTest::qIsPolishScheduled(QQuickWindow *) and QQuickTest::qWaitForPolish(QQuickWindow *) functions for verifying that updatePolish() was called on one or more items managed by a window. [ChangeLog][QtQuickTest][QQuickTest] Deprecated QQuickTest::qWaitForItemPolished(QQuickItem *). Use the new QQuickTest::qWaitForPolish(QQuickItem *) function instead. Fixes: QTBUG-93757 Change-Id: I95b6e051b3c9fd2fa93604f4d9ccda486bb29f9d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> 
This adds a qIsPolishScheduled(QQuickWindow *) overload of
qIsPolishScheduled(QQuickItem *) (added in
40d6072bc8a4df0fe1a16025fe30fe653463a446) and deprecates
qWaitForItemPolished() (added in
7a3cad0619662b992154e075ec6b840bfc8a46a7) in favor of qWaitForPolish(),
which has QQuickItem* and QQuickWindow* overloads.

The existing functions that take QQuickItem are useful, but testing
Qt Quick applications can be made even easier by allowing users to
check if a window has any items that need to be polished. This
information is already present (in QQuickWindowPrivate::itemsToPolish),
so it's very efficient to check for.

This is especially useful now that Qt Quick Layouts using polishing for
their layouting, for example, as it's no longer necessary to find
individual polishable items in complex hierarchies before proceeding
to interact with child items.

[ChangeLog][QtQuickTest][QQuickTest] Added
QQuickTest::qIsPolishScheduled(QQuickWindow *) and
QQuickTest::qWaitForPolish(QQuickWindow *) functions for verifying that
updatePolish() was called on one or more items managed by a window.

[ChangeLog][QtQuickTest][QQuickTest] Deprecated
QQuickTest::qWaitForItemPolished(QQuickItem *). Use the new
QQuickTest::qWaitForPolish(QQuickItem *) function instead.

Fixes: QTBUG-93757
Change-Id: I95b6e051b3c9fd2fa93604f4d9ccda486bb29f9d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Add FolderDialog 2021-12-10T22:36:44+00:00 Mitch Curtis mitch.curtis@qt.io 2021-11-01T14:44:24+00:00 5ba0e8229774d124ca15884962c32d30c0e81d0a [ChangeLog][QtQuickDialogs] Added FolderDialog. This is a native FolderDialog on platforms that support it, and a non-native Qt Quick FolderDialog on platforms that don't. Task-number: QTBUG-87798 Change-Id: I95d872f450b528e54dd26f5421b6c5a4b71a9bc3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
[ChangeLog][QtQuickDialogs] Added FolderDialog. This is a native
FolderDialog on platforms that support it, and a non-native
Qt Quick FolderDialog on platforms that don't.

Task-number: QTBUG-87798
Change-Id: I95d872f450b528e54dd26f5421b6c5a4b71a9bc3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>