aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickdialogs/quickdialogsquickimpl
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'v6.5.8-lts' into tqtc/lts-6.5-opensourcev6.5.8-lts-lgplTarja Sundqvist2025-12-031-2/+2
|\ | | | | | | | | | | | | | | | | Qt 6.5.8-lts release Conflicts solved: dependencies.yaml Change-Id: Id2eeb915139bdd1943ffc498173db540f22ca2f3
| * 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)
* | Merge tag 'v6.5.7-lts' into tqtc/lts-6.5-opensourcev6.5.7-lts-lgplTarja Sundqvist2025-10-096-17/+27
|\| | | | | | | | | | | | | | | | | Qt 6.5.7-lts release Conflicts solved: dependencies.yaml Change-Id: I8fbe9c1606825b726adf95e69a4fa86e2196f4e8
| * Fix undefined reference issue for Color object in MessageDialog qmlSanthosh Kumar2024-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The Color singleton object used in MessageDialog throws an undefined warning. Import the required module to resolve this issue. Change-Id: I929d9839274b7393e36c6d0ffe159037a92e2423 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 7ddac741d3718771f81991829579981323b4c189) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 1830b880bebde8cb2c64d39937ea423236d735ea) (cherry picked from commit f9e5087152ebfa9fb0501899eba44b4c9411bfa0)
| * Fix binding loop in FileDialogOliver Eftevaag2024-08-055-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch 1cc20d181bdee1131bf2eb191e7f8fe4e4927e03 introduced a nested dialog inside the FileDialog, which contained a Label as its contentItem. This would cause a binding loop, since the dialog would add itself as an implicitSize listener to the Label, and attempt to update it's own implicitSize twice, when the Label's text changes. Fix the issue by giving the dialog an explicit width. When the overwriteConfirmationDialog had an animation (which the Material Dialog has), it was possible to enter QQuickPopupPositioner::reposition(), when its parentItem (the fileDialogListView), no longer had a window. Add a check to return early, in those situations, to avoid a crash. Fixes: QTBUG-127619 Change-Id: I0324a2a470f237ba1a65a95d8bea7fa50166d756 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 036beb99621781b406b70e6c31841215393e38ea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit ee1fa04814d22565685d5d0fe2ccd5773fcb3276) (cherry picked from commit 85f768102226dafa98c068d3a00b971a0559140f)
* | Revert "Update commercial SPDX-License-Identifier"Tarja Sundqvist2025-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge tag 'v6.5.5-lts' into tqtc/lts-6.5-opensourceTarja Sundqvist2025-01-2915-19/+227
|\| | | | | | | | | | | | | | | | | | | Qt 6.5.5-lts release Conflicts solved: dependencies.yaml src/quick/doc/snippets/qml/treeview/qml-customdelegate.qml Change-Id: Ifa297315fa0e6e70d9f26312f9183da4769d18fc
| * FileDialog: set url schema when using the file name text fieldOliver Eftevaag2024-01-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the text field to choose a file name inside the non-native file dialog, the selectedFile property would be updated based on the currentFolder property and what the newly typed filename was. However, the schema was ignored. This patch fixes the issue by also setting the schema in QQuickFileDialogImpl::setFileName(const QString &fileName). Fixes: QTBUG-120065 Change-Id: I1860fbbc8209270d0bc6e34a4be6a91bad2253ab Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> (cherry picked from commit 26d9634468332fd3d6c4cc341aad67673d6b2cce) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f839b0ae73fdde85b7e453c2dd0210fd529907ca) (cherry picked from commit 53c60c2f94dfadc8cb89728de3b08ccf49b35afc)
| * Only update the filename text field when the user selects a fileOliver Eftevaag2024-01-117-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently, it's normal for file dialogs to not update the text field that represents the filename of the currently selected file, if the selected file is a directory. To achieve that behavior, I'm removing the binding on the text property, and instead call setText() to update the text field when either the user selects another file in the file dialog list view, or when the selectedFile is changed externally. But only if the selectedFile is an actual real file, and not a directory. Fixes: QTBUG-119917 Change-Id: I8dbf41ba403d09419a2d66130bdad59e66c9d1cf Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> (cherry picked from commit 8e734b2fc027dc53fca1f344d1ab234a0756ea89) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit ddee70ac8cebbba4e1f394d3d8b7149ef0436bc0) (cherry picked from commit 000e0ec5169fd055cc6d49af9842185f0e5b5b2c)
| * FileDialog: prompt the user when selecting an existing fileOliver Eftevaag2023-12-249-4/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is common for editing software to prompt the user when he/she wishes to save the work done in the editor, and an existing file is selected in the file dialog. This is an extra safety step, to hopefully prevent the user from accidentally shooting himself/herself in the foot, by overwriting an existing file and losing something valuable. One of the available file dialog option is DontConfirmOverwrite. Which according to the documentation, could be set in order to bypass a confirmation which is supposed to show up by default. But that weren't the case when using the non-native quick file dialog. The FileDialog will now show that confirmation dialog as a popup dialog, which popups up on top of the FileDialog, when selecting an existing file using the SaveFile file mode. The DontConfirmOverwrite option can now be used as intended, which will make the FileDialog behave like it used to, when selecting an existing file. In additon, hitting enter while the file dialog list view has focus, will now function the same as clicking the "Open" button. This was done in order to prevent the user from being able to bypass the new confirmation dialog. Fixes: QTBUG-119916 Change-Id: I07710a7126c53f489fd5554ea21e7684244a93c1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1cc20d181bdee1131bf2eb191e7f8fe4e4927e03) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d340459e7cd7b4ec9e7ae0e5166ad8879d22bdf7) (cherry picked from commit 025c130c1ed67b9dbd96cacac2de80e90ea07e1b)
| * FileDialog: improve keyboard navigation for all stylesOliver Eftevaag2023-12-165-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tab navigation between the file dialog list view, breadcrumbbar and name filters combobox wasn't implemented on all styles. Furthermore, the file name text field were not present in the tab focus chain at all, regardless of the FileDialog's fileMode. This patch fixes tab navigation for every style, and brings the file name text field into the tab focus chain when fileMode == SaveFile. Change-Id: Ie94d694449d545491c1198ec9b4594d8d475a210 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 33ba52c888d3f4d05e588dafe79c164e1059e295) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 0915fb622bb32a4f8bcb25e507942425e415a485) (cherry picked from commit 3c26ee4cb74244284767ec202d088f66b175be6b)
| * Check if QQuickFileDialogImplPrivate::options is null before derefEirik Aavitsland2023-12-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | A recent fix introduced an unchecked deref of d->options. No problem has been observed, but all other usages in this file are guarded, so avoid introducing a potential crash. Change-Id: I3602808c42094d24ba08d32612af3d3e95e90279 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> (cherry picked from commit 8ba21bb39fdb92de889c3ba5f3bc10428576a5f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d92f73f7684f2965244409f0cd6912fb89721c5b) (cherry picked from commit 8d006425f80aaae1d089bd607a55449ca3ab40a9)
| * Fix default button label for non-native file dialog in SaveFile modeEirik Aavitsland2023-12-141-1/+3
| | | | | | | | | | | | | | | | | | | | It would use the OpenFile label independently of actual mode. Fixes: QTBUG-105080 Pick-to: 6.6 Change-Id: Ia529f6854dd676197af99cbe0a610f5833181ce2 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> (cherry picked from commit 9184766ea929de23099da73366d99652c01a724f)
| * Update commercial SPDX-License-IdentifierTarja Sundqvist2023-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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 QML FileDialog file size overflowJonas Karlsson2023-11-275-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Since an int is too small to store the file size we use a string instead. Fixes: QTBUG-119005 Change-Id: I9b9a8724e8a1ca26b482396fb8a62aab206898cf Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 4be015c445e5fbba3ffa802797b74db1ebadac38) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a22eba305b22c76d9f38a171dc81336c01f6601d)
* | Revert "Update commercial SPDX-License-Identifier"Tarja Sundqvist2025-01-0391-91/+91
| | | | | | | | | | | | | | | | | | | | 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>
* | Revert "Update commercial SPDX-License-Identifier"Tarja Sundqvist2025-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 132fe2df41fc5e69fec39440b35137d5f0d63f6e. Revert of commercial SPDX license identifiers is required for the Qt 6.5.x opensource releases, Qt 6.5.4 onwards. Change-Id: Iadef6ed98a222d75529533fca818ed860ea9d0ac Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Update commercial SPDX-License-IdentifierTarja Sundqvist2023-12-131-1/+1
|/ | | | | | | | | | | 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 Pick-to: 6.5 Change-Id: I2cad9a7a271b0b3f3af3074259614b890b266a91 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Remove commercial SPDX-License-Identifier from build filesTarja Sundqvist2023-11-241-1/+1
| | | | | | | | | The build files should not include a commercial SPDX-License-Identifier. Instead, a BSD-3-Clause license identifier is used. Task-number: QTQAINFRA-5900 Change-Id: I419c4cea2bc0c836811155eddfe3bca2edb22323 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add license headers to shader sourceEskil Abrahamsen Blomfeldt2023-11-031-0/+3
| | | | | | | | | Pick-to: 6.2 5.15 Change-Id: I007eaddf0a3a9e7e6242d4e02b487fa0806c96a7 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 85e65e101bb7f4eecff0bdbbc6bde59ea8f6d73e) Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 960d6b5da1985552a1cba80732bb94f25340bd48)
* Update commercial SPDX-License-IdentifierTarja Sundqvist2023-10-2392-92/+92
| | | | | | | | | | 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>
* ColorDialog don't resize correctly on small screensFabio Falsini2023-05-225-5/+5
| | | | | | | | | | | | | The SaturationLightnessPicker control is set to always have a square shape but in this way when the screen height is not sufficient (as in the case of smartphones) the dialog does not fit going beyond the edges of the screen and became unusable Change-Id: I9b04286dd744c70ba0f4d27d85b0ef398f685b43 Fixes: QTBUG-113673 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 959f42e11fd4e75a6661bea6fe273f3d6adaff4f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build with -no-feature-listview and itemviewsTasuku Suzuki2023-04-132-20/+29
| | | | | | | | | | | | | | 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>
* QuickDialogs: Add QtQuick.Layouts as dependencyUlf Hermann2023-02-211-0/+1
| | | | | | | | | | | | This doesn't teach qmlimportscanner to understand dependencies, but it definitely isn't wrong. Task-number: QTBUG-111187 Change-Id: Ib252930b4423b6900a79e414f7a4ea15086619ea Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit ba092a525d01ee028bea6da271ea4baf64a62095) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QtQuickTemplates: Disambiguate static string constantsFriedemann Kleint2023-02-101-5/+0
| | | | | | | | | | They cause clashes in CMake Unity (Jumbo) builds. Task-number: QTBUG-109394 Change-Id: I2f1b6a7421f66d3d731d5a273242c2b27a882354 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 1d46547de70e13ab014f0846e39945aef5dcaf19) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build with -no-feature-validatorTasuku Suzuki2023-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By removing property, getter, setter and notify signal for validator. .../qmetatype.h: In instantiation of ‘constexpr bool QtPrivate::checkTypeIsSuitableForMetaType() [with X = QValidator*]’: .../qmetatype.h:2589:9: required from ‘constexpr const QtPrivate::QMetaTypeInterface* QtPrivate::qTryMetaTypeInterfaceForType() [with Unique = void; TypeCompletePair = QtPrivate::TypeAndForceComplete<QValidator*, std::integral_constant<bool, true> >]’ .../qmetatype.h:2639:102: required from ‘constexpr const QtPrivate::QMetaTypeInterface* const qt_metaTypeArray [72]<int, QVariant, QQmlInstanceModel*, bool, int, int, QString, QString, QString, QQmlComponent*, QQuickItem*, QQuickPopup*, bool, bool, bool, QString, QValidator*, QFlags<Qt::InputMethodHint>, bool, bool, double, double, QVariant, QString, bool, QQuickComboBox::ImplicitContentWidthPolicy, QQuickComboBox, void, int, void, int, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, QString, int, int, const QString&, QFlags<Qt::MatchFlag>, int, const QString&, QVariant, int, int, const QVariant&>’ .../moc_qquickcombobox_p.cpp:588:5: required from here .../qmetatype.h:1181:55: error: static assertion failed: Pointer Meta Types must either point to fully-defined types or be declared with Q_DECLARE_OPAQUE_POINTER(T *) Change-Id: I0ee5ae9c84bc977571f39788299f1d84a7e582c5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 67b3dc89013b6d3d0a190410004d1c4f9bd7fcf0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build with -no-feature-shortcutTasuku Suzuki2023-01-172-1/+10
| | | | | | | Change-Id: Ic62efb7a7e6f79920121f99f0d8b74eaaa3b7d4a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 06996887a4a1a0d9509078597d19efd8a737f2ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build with -no-feature-cursorTasuku Suzuki2023-01-161-0/+4
| | | | | | | Change-Id: Ibb89885c6cde3e49fffbc02f9c83880f2f2dda5d Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 74b9c2a96f25b69002e5cbb261abf425c9f51a3d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove "2" from Qt Quick Controls directoriesMitch Curtis2022-12-01165-0/+14893
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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-23 18:19:57 +0000