aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-171-2/+2
| | | | | Change-Id: Icf267260360f91b875569b18d215fed6ca462cb6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Do not keep QML engines alive across qmlClearTypeRegistrations()Ulf Hermann2021-06-171-1/+2
| | | | | | | | | | Otherwise the builtins don't get re-registered afterwards. Fixes: QTBUG-94575 Pick-to: 6.2 Change-Id: I7fa4965d5147adf0cc437d1b6102815cc206a6ea Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QQuickComboBox: fix acceptableInput being wrong if no validator was setOliver Eftevaag2021-06-172-3/+67
| | | | | | | | | | | | | | | | | | This patch fixes an issue with hasAcceptableInput(), if the property would be read before the contentItem had been set by the qml engine. This would cause hasAcceptableInput to return false by default, even though the default value is supposed to be true, if no validators or inputMasks are being used. The solution that I've chosen, is to give the QQuickComboBox its own acceptableInput variable, and connect the contentItem's acceptableInputChanged() signal to a function that polls for the contentItem property, and updates its variable accordingly. Fixes: QTBUG-94307 Pick-to: 6.2 6.1 5.15 Change-Id: I587d76162e75544a7ed1df9e3b9104bd73013bb0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Set inactive color for ButtonText in Fusion themeVolker Hilsheimer2021-06-171-0/+2
| | | | | | | | Fixes: QTBUG-94559 Change-Id: I66c84052801aab56ad759289053e20d32e13c765 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit f78072d5bc2d65307c86ce6e6fbc8d83fa82bc42) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use the added placeHolderText color available in PaletteAndy Shaw2021-06-1713-8/+14
| | | | | | | | | | This allows it to pick up the Palette's placeHolderText color by default while still using the property if it is overridden with that. Pick-to: 6.2 Task-number: QTBUG-93746 Change-Id: Ie6af95d6c60fa80f2789c2acd5964b5a347194ce Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix tst_palette by setting inactive color groupVolker Hilsheimer2021-06-161-0/+5
| | | | | | | | | | | Same colors as active, so that the binding test passes without having to wait for the window to become active. That's not what that test cares about. Fixes: QTBUG-94553 Pick-to: 6.2 Change-Id: I7b3cfb16ff6f64703faee0b2c90183af831390e5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix SwipeDelegate losing swipes to parent flickablesMitch Curtis2021-06-162-8/+39
| | | | | | | | | | Use a smaller threshold than Flickable so that it doesn't steal our events. Fixes: QTBUG-55705 Pick-to: 5.15 6.1 6.2 Change-Id: I7e985c27788818226a3158078d485ea12ddd7006 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Add recursion guard to QQuickApplicationWindowPrivate::relayout()Jan Arve Sæther2021-06-163-1/+107
| | | | | | | | | | | | | relayout() might change the size of the header, footer or contentitem When one of those items changes, QQuickApplicationWindowPrivate will get notified by that through QQuickApplicationWindowPrivate::itemGeometryChanged(). itemGeometryChanged() will then call relayout()... (*recursed*). Pick-to: 5.15 6.2 Task-number: QTBUG-87708 Change-Id: I9403952e776afb2be37d009642c65b5520c79341 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: make it clear that Page doesn't render its title textMitch Curtis2021-06-161-0/+3
| | | | | | | | This is demonstrated in the example, but it's better to make it clear. Pick-to: 5.15 6.1 6.2 Change-Id: Ie5efcca2256da6a03d31df9cf045f4a97d1ad1ed Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Blacklist some flaky tst_qquickpopup functions on openSUSEMitch Curtis2021-06-161-0/+9
| | | | | | | Task-number: QTBUG-94251 Pick-to: 5.15 6.1 6.2 Change-Id: I5f06bba2522c07a29897501932c02b87e9cae356 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Blacklist some flaky tst_qquickdrawer functions on openSUSEMitch Curtis2021-06-161-0/+8
| | | | | | | Task-number: QTBUG-77946 Pick-to: 5.15 6.1 6.2 Change-Id: I11f3e275d76833754a994d1bf09e50fa1328828c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* tst_qquickpopup: Don't leak created objectsUlf Hermann2021-06-151-1/+2
| | | | | Change-Id: Ie1359fb407088adcc91b45ae18c682dda8822a67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickPopup: finalizeExitTransition before deleting internalsUlf Hermann2021-06-151-4/+5
| | | | | | | | Otherwise they get re-created and leak. Pick-to: 6.2 Change-Id: Ib6af70bed196d3b32faa1df7f40063a38e321987 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix warnings in some testsMitch Curtis2021-06-144-30/+29
| | | | | | | | | | | | | | The warnings were all along the lines of: TestCase.qml:672: Error: Cannot assign [undefined] to double At some point the behavior was changed so that you can no longer pass undefined to initial property values, so account for that by having the data rows construct the properties object directly. Pick-to: 6.2 6.1 5.15 Change-Id: I7180e9fc664650b87ae0305b7f829cd7266be1ab Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Remove unneeded CMake variable assignmentsJoerg Bornemann2021-06-141-8/+0
| | | | | | | | | | | | Remove assignments to the transitionary variables QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS and QT_USE_FIXED_QT_ADD_RESOURCE_BASE. Both are not needed anymore. Task-number: QTBUG-94444 Change-Id: I6085882a944f423da719ac13c8a12a4962c63bf6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Don't leak buttons in QQuickDialogButtonBoxUlf Hermann2021-06-111-0/+1
| | | | | | Fixes: QTBUG-94455 Change-Id: I8d8c82f3b10e5e755ac11924c335ee07ab08d4a6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix build without features.quick-tableviewTasuku Suzuki2021-06-111-2/+6
| | | | | Change-Id: I6b96d3d196b6d48e6dd53c74eb021e72840ac6be Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Doc: some ComboBox functions must be used after component completionMitch Curtis2021-06-104-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | The internal QQmlDelegate model may not be ready until after componentComplete() is called. For example, the following code will print -1 for the find call, even though printing the model will show the "Hello" entry: ComboBox { id: comboBug anchors.centerIn: parent model: ["123", "BlaBla", "Hello", "Turtle"] currentIndex: { console.log("Model: " + comboBug.model) console.log("Find: " + comboBug.find("Hello")) return comboBug.find("Hello") } } Fixes: QTBUG-94257 Pick-to: 6.1 6.2 Change-Id: I6e8c2a4eb8ca7ffca0a38d2f2e914cf791d3bd2e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* doc: move the SelectionRectangle snippet to correct the placeRichard Moe Gustavsen2021-06-102-7/+7
| | | | | | | | | | After the cmake changes that restructured the repository, the snippets are now located in a different place. Update the documentation for SelectionRectangle to reflect this, and correct some related documentation issues at the same time. Change-Id: I4860973bf101dc6c2dce5f64822235f0b5b73ce6 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* AbstractButton: emit doubleClicked() for touch eventsMitch Curtis2021-06-0922-121/+205
| | | | | | | | | [ChangeLog][Controls][AbstractButton] doubleClicked() is now also emitted for touch events. Fixes: QTBUG-82146 Change-Id: Ie1e24d291bd4b592edd91fc762da8636e08698df Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Stabilize tst_qquickpopupFabian Kosmale2021-06-092-22/+33
| | | | | | | | | | | - Give the window system some time to change the cursor - Wait for popups to be properly opened and closed Task-number: QTBUG-94251 Change-Id: Ie380312daddcb2ee95f337c321ca2724c3b9f182 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update copyright header to refer to Qt Quick DialogsOliver Eftevaag2021-06-0952-52/+52
| | | | | | | | | 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. Pick-to: 6.2 Change-Id: I855edbca61f8e5c2a08dea50b5c70f1cdb3f996f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-071-2/+2
| | | | | Change-Id: Ic7563f9b13b2e1aff2fc62a30304e39d7980dbc9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add new control: SelectionRectangleRichard Moe Gustavsen2021-06-0611-0/+1269
| | | | | | | | | | | | | | | | | | This patch will add a SelectionRectangle to controls. A SelectionRectangle can be used together with TableView to let the user select cells using either pointer Drag or PressAndHold. It lets the developer set their own handle delegates, or simply use the included ones added to the Basic style. [ChangeLog][Controls][SelectionRectangle] A SelectionRectangle has been added to Controls. A SelectionRectangle can be used to make selections in TableView. Fixes: QTBUG-74750 Change-Id: Ia7af578c1c905b0e92df193d7820ad6ef2c9b697 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-051-2/+2
| | | | | Change-Id: Iede658c933609dc76a809407c16517522782f2e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-051-2/+2
| | | | | Change-Id: Ic3f273bc69b90692fc17ff02ef13365f5a4693be Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update to latest qml CMake APICraig Scott2021-06-052454-1724/+769
| | | | | | | | | | | | | | 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>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-051-2/+2
| | | | | Change-Id: I8d9d8cb91bc0d4443386dd0c242d700986de7a21 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add FontDialog to QtQuick.DialogsOliver Eftevaag2021-06-0426-2/+3635
| | | | | | | | | | | 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>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-031-2/+2
| | | | | Change-Id: Idba873c3344ba01bb976446fb78f3585ec59240b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix FINAL warningMitch Curtis2021-06-035-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | An example of the warning: "Final member contentWidth is overridden in class QQuickPage. The override won't be used." - Remove FINAL from base class properties that are overridden by subclasses where it's not clear if it would be safe to not override those properties - Everywhere else, stop redeclaring properties in subclasses. This will result in e.g. MenuBar not having a contentWidth property if the QML is importing version 2.4, but as we're now long past that version, it should be fine. This fixes some auto tests that were failing after ba2928c787cf0988a7f6a7d424faea96ff707846. [ChangeLog][Important Behavior Changes] QML code that imported version 2.4 or earlier will no longer be able to access contentWidth and contentHeight in types derived from Container (i.e. MenuBar, etc.). Fixes: QTBUG-94180 Change-Id: I3cdb79de8a1b54ab0c78ad661c432c47d5d1dfc6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Adjust to bindable QQuickItem propertiesFabian Kosmale2021-06-032-3/+3
| | | | | | | | | | This prepares for QQuickItem's properties becoming bindable, changing the type of QQuickItemPrivate::{x, y, width, height}. It adds explicit casts/types where implicit conversion or type deduction would fail after the conversion. Change-Id: I9e25b45d1c7de162c3e72e8ec337b198bfd29c57 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add a foreign registration for QQuickColorGroupUlf Hermann2021-06-011-0/+8
| | | | | | | | | | It has aqcuired revisioned properties. Task-number: QTBUG-33179 Change-Id: I31ce4b07649ccc20789ed15bfb50e1643f6e4bff Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-011-2/+2
| | | | | Change-Id: Ia4d60b5c98694c7c940593f45be5040714480729 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-011-2/+2
| | | | | Change-Id: I6b043437b934bf7fa148c3d24198691b4896a7ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove no longer used dependencies.json filesCraig Scott2021-05-316-57/+0
| | | | | Change-Id: I82a18e7a0e768fe57c9cb08666b5486ecfa00ba8 Reviewed-by: Fabian Kosmale <fabian.kosmale@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>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-311-2/+2
| | | | | Change-Id: I8fc4ded1155db86a8ed3306b738df0966f20e6f6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix MSVC warning C4267Kai Köhne2021-05-281-1/+1
| | | | | | | | | | | | | | | | | C4267: 'argument': conversion from 'size_t' to 'const Key', possible loss of data in deferredStates()->insert(qHash(object, property), state); and QQmlComponentPrivate::DeferredState *state = deferredStates()->take(qHash(object, property)); The return type of qHash got changed to size_t in commit bd5b9cae7a29 Change-Id: If11de4fcd29a4d6ac8104e55ce18dd82f372054e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix MSVC warning C4065Kai Köhne2021-05-281-5/+8
| | | | | | | | | | MSVC doesn't like it when there's only a default switch: qquickwindowsstyle.cpp(2284): warning C4065: switch statement contains 'default' but no 'case' labels Pick-to: 6.1 Change-Id: I3d6072e88a3aeec3a6801c2b0ddffd8e9f511943 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-281-2/+2
| | | | | Change-Id: Ie50f8f138e4484cc13da8f6d9556d933200b5119 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add QtQuick.DialogsMitch Curtis2021-05-27152-30/+10947
| | | | | | | | | | [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>
* Sync the visibility of the FocusFrame with the target itemAndy Shaw2021-05-271-1/+1
| | | | | | | Fixes: QTBUG-93994 Pick-to: 6.1 Change-Id: Ib9138f6bc59bcf7b97d5ccb478c7b9c434dfef64 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-271-2/+2
| | | | | Change-Id: Ifc860cb44387453b8aa24dc7878e74218f297c24 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "AbstractButton: set automatically as checkable when being checked"Alexander Akulich2021-05-262-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8ba12ed7f25d8cfb7619b6eb0a26fe4ae3e823b1. The referenced commit was introduced to simplify buttons setup: Button { checked: true } Button { checkable: true } With the commit the first button becomes 'checkable' automatically. However, the implemented behavior violates the principle of least surprise, listed in "API Design Principles". The following checkbox will be checkable despite of the explicitly set properties: CheckBox { checked: true checkable: false } This is a "surprising" behavior which makes some rare and already complex use-cases unnecessarily complicated. The save of explicit "checkable: true" does not justify the surprice and the ugliness of the code needed to overcome the forced checkable property if needed. [ChangeLog][Important Behavior Changes] Setting the AbstractButton's 'checked' property to 'true' does not automatically set its 'checkable' to true anymore. Fixes: QTBUG-93807 Change-Id: Ia35138ee6a09bb9f361f52a84e53578b0b6e57e3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix layout is always RTL when locale is RTLHyunkook Khang2021-05-269-68/+82
| | | | | | | | | | | | | | | | isMirrored() will always return true when locale is RTL, so that we cannot change the layout. To fix this, remove out the relation between LayoutMirroring.enabled and locale's text direction. [ChangeLog][Controls][Important Behavior Changes] Control's locale property no longer affects layout direction. Use LayoutMirroring instead. Fixes: QTBUG-91227 Change-Id: Ibedd3f09828f81f1889077892452a27c90e21533 Reviewed-by: Hyunkook Khang <hyunkook.khang@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-261-2/+2
| | | | | Change-Id: I9b921b256e6b9624a579bddf778e0a86d7756afa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* TextArea: Detach the flickable when it is deletedAndy Shaw2021-05-262-0/+19
| | | | | | | | | | | When the flickable is deleted before the TextArea is (which can happen when it is a child of a ScrollView) then we need to make sure that the TextArea no longer keeps a reference to the Flickable object. Fixes: QTBUG-93958 Pick-to: 6.1 5.15 Change-Id: I1745065370718e60bc459192e15eae0e1ba36231 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-241-2/+2
| | | | | Change-Id: I9d3033167645e79c9bb5248a367d85514af13ee8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-241-2/+2
| | | | | Change-Id: I97dffd3e1c8f94ac42fa30f0aaf54523645cdafa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>