aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickdialogs2/quickdialogs2quickimpl
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-6.2.6' into ↵Tarja Sundqvist2023-03-0111-7/+20
|\ | | | | | | | | | | tqtc/lts-6.2-opensource Change-Id: Ie5a87ae61d8ed0429225353ad46e5232d60f4daa
| * Imagine: don't show hover effects when disabledMitch Curtis2022-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 831efa14e91cfa358e57a32197578d41c2ae1b24 made disabled items get hover events, so we need to check if a control is disabled before showing hover effects. Task-number: QTBUG-94919 Change-Id: Iee93a053780e7c3c604ae62a99665fdc83be5421 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e987d6029727ed22d12971080ae905732654f93f) Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * FolderBreadcrumbBar: remove unused idsMitch Curtis2022-07-225-5/+0
| | | | | | | | | | | | | | | | | | | | These were making qmllint complain. Task-number: QTBUG-83755 Change-Id: I3353db445cdb043f4a8613c2838d3899e619a831 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 3fa706b341e6e592015066d84901eb8c0c091dfd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * FileDialog: disable animation when currentIndex is set internallyMitch Curtis2022-07-211-0/+1
| | | | | | | | | | | | | | | | | | We don't want the ListView to e.g. animate a currentIndex change to the Selected file on startup. Change-Id: I7bb058bf74bd4096702f5fdae017417e444c5ed1 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 1184700f9d1a0f455448fcbf454b484626d70527)
| * Fix flaky tst_QQuickFileDialogImpl::goUp testMitch Curtis2022-07-051-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Don't listen to fileDialogListView currentIndexChanged signal while setting its currentIndex, because the file associated with the delegate is not correct at that stage. Change-Id: Iffc9315c03b6670bc3a7609f3613a4570e4f9632 Fixes: QTBUG-101488 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit dc86f974f0ce5ac57ddeceee3b020661b932f6b1) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * QuickDialogs2QuickImpl: includemocsMarc Mutz2022-07-015-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Including moc files directly into their classes' TU tends to improve codegen and enables extended compiler warnings, e.g. about unused private functions or fields. Manual conflict resolutions: - dropped all includes into non-existing files Task-number: QTBUG-102948 Change-Id: I69a76a7e25c2f260801190ef1803b561b7300b5d Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 9021e0de909aa757918c25d5f98a57f60035775a)
* | Revert "Update commercial license headers"Tarja Sundqvist2022-11-2441-898/+898
|/ | | | | | | | | | | This reverts commit 74089697cf2a4961fb697100555b17ae2342d734. Revert of commercial license headers is required for the Qt 6.2.x opensource releases, Qt 6.2.5 onwards. Task-number: QTBUG-107760 Change-Id: Id49069cb5e5f261da185fd082dfb71deb259d387 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add QtQuick.Templates dependency to QtQuick.Dialogs.quickimplMarco Bubke2022-06-041-0/+1
| | | | | | | | | | | QQuickItemDelegate is referenced as prototype but there is no dependency declared to QtQuick.Templates where it is defined. Change-Id: I71e3ef45ad00e77dc31c0e4f46f784dc9910f7a2 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 189059ef43be3e447febc8967a70087ec52ed623) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update commercial license headersTarja Sundqvist2022-06-0441-898/+898
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtdeclarative. Examples, tests, or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4941 Change-Id: I32f554b0a8cb527f74d46f3c02b0e745d9fc5ddf Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Dialogs: Declare dependency on QtQuick typesYuya Nishihara2022-01-181-0/+2
| | | | | | | | | | | | | | | Otherwise qmllint in user code would report missing types. No type found for property "nameFilters". This may be due to a missing import statement or incomplete qmltypes files. QuickTemplates2 has this dependency properly so it should be intact. Change-Id: I13fadddb053874cc615f071eec473d5641b12d1a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> (cherry picked from commit 07caa0109b8e1be942e9b47ac0ed80f3e68ef67a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Attempt to fix QNX tests linking when cross-compilingAndrei Golubev2021-12-211-0/+2
| | | | | | | | | | | | Amends 7d22d32dc0840510c47d6321955a53442b418dfe We need to apply the same idea to QuickDialogs2QuickImpl it seems Task-number: QTBUG-86533 Change-Id: Ib7d11c196659aa16ab7a8cda1a199c6b1c7179f9 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 66a7192768647d6ca159c18f799e81500e8aa206) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* FileDialog: sort case-insensitivelyMitch Curtis2021-11-065-0/+5
| | | | | | | | | This matches what Windows, macOS, and Linux do. Fixes: QTBUG-73633 Change-Id: Ibf20acda17ab65b48599b3936bef7679375060d9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e26427264e6bcc8fde33271ffbe0cc51513d3d4f)
* QuickFontDialog: make setCurrentFont() update listview indexesOliver Eftevaag2021-11-033-100/+130
| | | | | | | | | | | | | | | | | | For the non-native implementation of the QQuickFontDialog, when the qml user assigns a new font to the currentFont property, the list view indexes should be changed to point the family, style and pointSize of the new font. In cases where the family, style or size of the new font exists in the model for the representing listview, the index for that listview should be updated to the new value, or 0 if the value isn't found, or -1 if the model is empty. Fixes: QTBUG-96934 Change-Id: Ia7bb11d01c4a0807d0df742f34bd8aefb00104f6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 3c15f90fc6b4f2b5689eaa8b70fb5ca76237540d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickFileDialogImpl: fix issues with breadcrumb bar text editMitch Curtis2021-10-181-5/+13
| | | | | | | | | | | | | | | | | - Always set the text edit's text to the current directory, not the selected file. This matches the expected behavior of a file dialog. - Fix an issue where the text edit's visibility was toggled twice, resulting in it showing up on top of the breadcrumbs when it shouldn't. The latter issue was found while fixing the former, and they are both tested by the same auto test. Change-Id: I8f1420ec9edaba1e33f1d1a268567a45d63d76b5 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit d000649cb705ea1239023c3d3d27a781137c57b4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickFontDialogImpl: Fix ValueType errorOliver Eftevaag2021-10-081-2/+2
| | | | | | | | | Referencing GroupBox by id rather than by parent. Change-Id: Idf5eb767539074e070a4c20336bcfa26b4e480a6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit c96c49bcedfeb4ea47044a2cc877a2763ddd17fe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Rename QQuickFileNameFilterForeign to avoid potential build issuesMitch Curtis2021-08-131-1/+1
| | | | | | | | | | | | | | An error was reported for static builds: [...]libQt6QuickDialogs2QuickImpl.a(mocs_compilation.cpp.o):(.data.rel.ro.local._ZN27QQuickFileNameFilterForeign16staticMetaObjectE+0x0): multiple definition of `QQuickFileNameFilterForeign::staticMetaObject'; [...]libQt6QuickDialogs2.a(mocs_compilation.cpp.o):(.data.rel.ro.local._ZN27QQuickFileNameFilterForeign16staticMetaObjectE+0x0): first defined here This patch attempts to fix it by giving each foreign struct a different name. Change-Id: I1b859ad1ec7b0ce82b40a1fa5a74ceb219841bf3 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 7ff08e04deff31d64d682a7584b4eecfdfcf4e53) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix controls packages to have correct Qt package dependenciesAlexandru Croitor2021-08-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | The Qt6QuickControls2 package did not get a Dependencies.cmake file generated to call find_package(Qt6Quick) because Quick was removed from the PUBLIC_LIBRARIES section of the Qt module definition. Same for the other controls Qt modules and their dependencies. Those were incorrectly removed with the idea that they were plugin targets which don't have public dependencies, but that's not the case, they are Qt modules, not plugins. Restore the public library dependencies, so that transitive find_package'ing works. Amends 9c30798a439e6a87b574472aca7a4e15107c6221 Fixes: QTBUG-95532 Change-Id: Ie2cb69cdde5585e90a5ce97a6d3666a647daef40 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 131682ec7df14b661c6a1290c683cac436c1328e)
* QQuickFontDialog: Minor visual adjustments for universal and materialOliver Eftevaag2021-07-192-1/+4
| | | | | | | | | | | | | | | These changes are subjective, and might not be seen as an improvement by everyone. Personally, I felt that some space could be removed between the text fields and list views for the material style, and between the list views and group boxes for the universal style. Task-number: QTBUG-87799 Change-Id: I2a94caaa2304ccef0c9709bbfe9a0cd9b56e2034 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit ef9e58808c42ad52b3481de342309d8c4e9e8ee9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove unnecessary type registrtion function declarationsUlf Hermann2021-07-161-2/+0
| | | | | | | | | For auto-generated plugins we don't need the declarations. Change-Id: I0250703e7c81debc6bc6ca526722c43b8a8058c8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit fd2a2808ac2c53220c907d7177aee0d172102859) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve visuals of non-native FontDialogsMitch Curtis2021-07-145-8/+11
| | | | | | | | | | | | | | | | | | - Specify preferredHeights directly on the items that need them rather than doing it at a higher level. This makes the lower row with the text edits and check boxes shorter, giving more space to the row with the list views. - Convert the ColumnLayout containing the check boxes into a RowLayout to save vertical space. - Add some spacing and padding where necessary now that everything is more compressed. Task-number: QTBUG-87799 Change-Id: Iba288f678c1d449ace3bc143073d216fe69d9d9a Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e2f4afcedb857f22e80671b638a80245a09cb249) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Adjust to QQuickItemPrivate::{width,height}Valid becoming a functionFabian Kosmale2021-07-121-1/+1
| | | | | | | | | Task-number: QTBUG-94703 Change-Id: I2c48f1cc94b8dd94cddab1d833f62299d35fe5d9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> (cherry picked from commit 2a4ff847e8c018f31b14ecffd229d3793138ab1b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Don't give plugins PUBLIC usage requirementsJoerg Bornemann2021-07-091-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | The pro2cmake.py conversion script faithfully reproduced the .pro files for the plugins, which specified the libraries as public. But in CMake, the implications of this are that public usage requirements should then be propagated to consumers. We don't expect any consumers, since a plugin is created as a MODULE library in CMake, so for Windows we don't even have an import library to link with. The only exception to this is for static builds where plugins are created as STATIC libraries instead, but only in certain controlled situations do we then link to plugins. Even then, usage requirements are not expected to propagate to the consumers, so these relationships should always be specified as private. As a drive-by fix, remove Qt::Foo dependencies that are already implied by Qt::FooPrivate. Task-number: QTBUG-90819 Change-Id: I3f33766612367520e09e599f03ac06d43613aa81 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 9c30798a439e6a87b574472aca7a4e15107c6221) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update copyright header to refer to Qt Quick DialogsOliver Eftevaag2021-06-0941-41/+41
| | | | | | | | | | The source files in Qt Quick Dialogs should now have a copyright header that mentions they are indeed a part of the Qt Quick Dialogs module. Change-Id: I855edbca61f8e5c2a08dea50b5c70f1cdb3f996f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 74ab735615b74d3f91748f069d9f24b5ab73adbf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update to latest qml CMake APICraig Scott2021-06-051-36/+32
| | | | | | | | | | | | | | The new qml CMake API places a closer relationship between the backing target and the plugin target. Both are typically created together and they share a lot of common details. Instead of creating them in different parts of the source tree, they are now specified together. The src/imports area has effectively been absorbed into the other corresponding subdirectories below src with this change. Task-number: QTBUG-91621 Change-Id: I9bd32e9eb78c198ccc9db04e2829303cac323502 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Add FontDialog to QtQuick.DialogsOliver Eftevaag2021-06-0413-1/+2450
| | | | | | | | | | | Adding non-native FontDialog to QtQuick. This is a native FontDialog on platforms that support it, and a non-native Qt Quick FontDialog on platforms that don't. Fixes: QTBUG-87799 Change-Id: I43a59e3668a8a40f1d0c04a3c2506283d552a22b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix typo in exported declaration of qml_register_types... functionCraig Scott2021-05-311-1/+1
| | | | | | | | | | | This prevented the function from being exported if something actually tried to use it. At the moment, no other file is including the affected header (that is a separate bug in qmltyperegistrar), which is why the build wasn't failing despite the typo. Change-Id: Ia9b266c4f5a42326932344e49bea228fd36ebb65 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add QtQuick.DialogsMitch Curtis2021-05-2797-0/+6092
[ChangeLog][QtQuickDialogs] Added FileDialog. This is a native FileDialog on platforms that support it, and a non-native Qt Quick FileDialog on platforms that don't. Fixes: QTBUG-87797 Change-Id: Ia3a98b616479b818c96c232a0329750023079642 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>