Commits (28)
-
J-P Nurmi authored
QQuickPopup is backed by a QQuickControl subclass aka QQuickPopupItem. However, since the QML engine sees "background" and "contentItem" as properties of QQuickPopup, we must ensure that the deferred properties are executed for the QQuickPopup wrapper object. Task-number: QTBUG-50992 Change-Id: I2ec055b382e41530a6f4a740cb80853c0181c21a Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
f5c13e14 -
J-P Nurmi authored
Flickable has a default maximumFlickVelocity of 2500 regardless of its size. When SwipeView covers the whole screen and ends up being large, 2500 pixels per second is nowhere near enough. Calculate a suitable maximum flick velocity based on the size of the view. Task-number: QTBUG-62110 Change-Id: Iaf26f586f99e7635ea931a4e3060ad4dd480a011 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
44382ff1 -
J-P Nurmi authored
QQuickText's default horizontal alignment is AlignLeft. There's no need to repeat the default. Furthermore, an empty QQuickText element does not do anything, so the "visible: control.text" binding seems bogus. Change-Id: I9461301606c45a3d889ad49e62356d38fcef6f87 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
bbdf0c2d -
J-P Nurmi authored
Unlike with mouse events there's setAcceptedMouseButtons(), currently there's no way to control whether a control receives touch events or not. As a temporary workaround until QQuickItem::setAcceptTouchEvents() has been added, we'll have to ignore touch events by hand. Task-number: QTBUG-65084 Change-Id: I3d51bdc80981557399f3bdfd181e359679cd1c20 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
d1706827 -
J-P Nurmi authored
Change-Id: I1698392b1ef75b84d114cb19207729217abb4aed Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
aea42abe -
J-P Nurmi authored
Change-Id: I80c258ea21b4f6651e9c6e075357daabfb32d64b Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
6d88fc14 -
J-P Nurmi authored
Change-Id: Id7c65c9493c0e70512f3f2b167a091ece06ee5d8 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
b7216da7 -
J-P Nurmi authored
Since 8e4b9103 , we've been often seeing the following failure in CI: FAIL! : tst_controls::Default::Tumbler::test_itemsCorrectlyPositioned() Compared values are not the same Actual (): 0.00008000000001118224 Expected (): 0 Loc: [/Users/qt/work/qt/qtquickcontrols2/tests/auto/controls/data/tst_tumbler.qml(352)] QQuickPathView uses such tiny 0.00001 offsets internally. => Use fuzzy compare for the expected position. Change-Id: Ie6c1025003aa57335232d23fb8466d1578dc1ab3 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
aaedef9f -
J-P Nurmi authored
Maintain the tested controls and delegates in a single array that can be re-used for testing all styles without repetitive and error-prone hand-written data rows. For this to work, the structure of the tested styles must match. The "incomplete" and "override" styles filled in all possible delegates, whereas the "simple" style filled in only the normally used delegates. The test styles have now been synced with the structure of our built- in styles. For example, Dials and Sliders don't normally have a content item, and CheckBoxes and RadioButtons don't normally have a background. Change-Id: I48a26ee170f66882c55b54a282f2e4b3a3875f9a Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
4367be99 -
J-P Nurmi authored
Remove the undesired internal IDs where easily possible, and add expected failures for the harder ones for now. Task-number: QTBUG-65341 Change-Id: I5964b2cb59652661c90141259c68b95c721cf6ca Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
b94cb52c -
J-P Nurmi authored
An internal ID in the OpacityAnimator element prevented deferred execution for the whole content item. Apply the same visibility trick in C++ to avoid having to use an ID in QML. Task-number: QTBUG-65341 Change-Id: Icb20e4ecc60d1093e849737799bb269f7f03097a Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
da27cace -
J-P Nurmi authored
An ID in the internal Text element prevented deferred execution for the whole content item. The ID was used for two reasons. First of all, it was used to propagate implicit size from the Text element to the root of the content item. Secondly, it was used to calculate clip areas to provide the same text in two different colors. This patch provides two internal C++ helpers, ItemGroup and ClippedText, that provide these functionalities without the need of using IDs in QML. At the same time we got rid of two wrapper Items and simplified some QML bindings, which results to a nice boost (18->22) in qmlbench on TX1. Task-number: QTBUG-65341 Change-Id: Icf9c09356cf5c0ed641bde537bee7291bd260057 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
1e33020f -
J-P Nurmi authored
If the QML engine refuses to defer execution of a delegate (it contains an ID), we must make sure to cancel any pending deferred execution for the same delegate. Otherwise, we may end up overriding a custom (non- deferred) delegate with a default (deferred) delegate. This patch adds a new test style "identified" to tst_customization. This style contains delegates with IDs so we can test the behavior with IDs in base styles. Furthermore, overriding delegates is now tested in various ways (with and without IDs in the base and custom styles) in a separate test method. This is done by generating QML code to override delegates with dummy Item instances with appropriate IDs and names. Task-number: QTBUG-65341 Change-Id: Ie6dca287cb74672004d9d8f599760b9d32c3a380 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
c40486ac -
Jani Heikkinen authored
Old header.LGPL21 header was used at some files. Replase those with new header.LGPL one Task-number: QTBUG-57147 Change-Id: I7d707c15b33c0f14810ef8fffef9f74dd4192e64 Reviewed-by:
J-P Nurmi <jpnurmi@qt.io>
54352f17 -
J-P Nurmi authored
The condition for checking whether a tool button is square and thus, whether it should use a round ripple instead of a fill ripple, must be based on the size of the contents, not on the implicit size. This way, you get a round ripple for one-letter tool buttons but only if they are not stretched. Task-number: QTBUG-65052 Change-Id: I0d498dc65650f3b786b41e538748549d61f2b216 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
951cf6ba -
Mitch Curtis authored
Task-number: QTBUG-60550 Change-Id: I14c4d0343e2b02180bbce0546a69a7241ee6008e Reviewed-by:
J-P Nurmi <jpnurmi@qt.io>
6f760707 -
J-P Nurmi authored
Fix style selection, and make override() actually fail with internal IDs in the built-in styles. Change-Id: Ied321c46cd74039f84b683fb6df99aef2d488eef Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
f9e62a1c -
J-P Nurmi authored
Due to unclear auto test failurs, Tumbler does not yet have deferred execution enabled for its content item. Because of this, the test is getting full of skips and expect fail's for Tumbler. Just leave it out for now and restore later when Tumbler is fixed. Change-Id: Iab9465e002572d15e5bda6dbd53b71594f593703 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
c996c22d -
J-P Nurmi authored
Change-Id: I8ee27a0c65c9ce8c9cc48c6f59d2b34d02849be8 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
368e8046 -
J-P Nurmi authored
Same as da27cace for the Default style. An internal ID in the OpacityAnimator element prevented deferred execution for the whole content item. Apply the same visibility trick in C++ to avoid having to use an ID in QML. Change-Id: I4b54bbe3044aff9603b1135ac25d7325e01fdff2 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
31a65540 -
J-P Nurmi authored
RoundButton was a new type in QQC2.1 (Qt 5.8). Even though passing a non-existent revision seems to be harmless, registerTypes() becomes easier to read when we distinguish between new types and new revisions. Change-Id: I682006570f63dd0b2cb2260740fb105619e61a28 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
108f4829 -
Kai Koehne authored
[ChangeLog][Third-Party Code] Document constants from AngularJS in src/imports/controls/material/ElevationEffect.qml Task-number: QTBUG-65409 Change-Id: Ibd0dcf643abe036f34cea364f267fde8510057ea Reviewed-by:
J-P Nurmi <jpnurmi@qt.io>
f2696aca -
Mitch Curtis authored
Link to relevant documentation and add entries for the Controls section to the configuration file docs. Task-number: QTBUG-65445 Change-Id: I175866167e36403475520ea4de0cb299aae542d7 Reviewed-by:
J-P Nurmi <jpnurmi@qt.io>
aa9308d1 -
J-P Nurmi authored
The qmlbench repo has benchmarks only for a subset of controls. They are part of a larger collection of benchmarks that are run periodically, for which the results are collected to Grafana. We have limited resources there, so we don't want to overload it with benchmarks for every single control type. However, for our own benchmarking purposes it is useful to be able to easily benchmark all of them. Change-Id: I920e4c07bce8356e5d9f41d4c1d6ae43e37bb13e Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
55522df4 -
J-P Nurmi authored
The static value type provider instance must be moved from the plugin (libqtquicktemplates2plugin.so) to the library (libQt5QuickTemplates2.so) to keep it alive when qmlClearTypeRegistrations() is called and the plugin is unloaded. This fixes the warning that was being thrown a lot in tst_qquickmenubar on macOS: QWARN : tst_qquickmenubar::Default::UnknownTestFunc() QQml_removeValueTypeProvider: was asked to remove provider 0x117dc97f8 but it was not found Change-Id: I4448e497672c834786af0132b6ed5f03c3931773 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
e7d9df8d -
J-P Nurmi authored
Conflicts: src/imports/controls/BusyIndicator.qml src/imports/controls/CheckBox.qml src/imports/controls/CheckDelegate.qml src/imports/controls/ComboBox.qml src/imports/controls/DelayButton.qml src/imports/controls/Dial.qml src/imports/controls/ItemDelegate.qml src/imports/controls/MenuItem.qml src/imports/controls/RadioButton.qml src/imports/controls/RadioDelegate.qml src/imports/controls/SwipeDelegate.qml src/imports/controls/Switch.qml src/imports/controls/SwitchDelegate.qml src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc src/imports/controls/material/CheckDelegate.qml src/imports/controls/material/ItemDelegate.qml src/imports/controls/material/MenuItem.qml src/imports/controls/material/RadioDelegate.qml src/imports/controls/material/SwipeDelegate.qml src/imports/controls/material/SwitchDelegate.qml src/imports/controls/qquickdefaultbusyindicator.cpp src/imports/controls/qquickdefaultbusyindicator_p.h src/imports/controls/qtquickcontrols2plugin.cpp src/imports/controls/universal/CheckDelegate.qml src/imports/controls/universal/ItemDelegate.qml src/imports/controls/universal/MenuItem.qml src/imports/controls/universal/RadioDelegate.qml src/imports/controls/universal/SwipeDelegate.qml src/imports/controls/universal/SwitchDelegate.qml src/quickcontrols2/quickcontrols2.pri src/quicktemplates2/qquickcontrol.cpp src/quicktemplates2/qquickmenu.cpp src/quicktemplates2/qquickpopup_p.h Change-Id: Ib25c8b4a7fe018b7c0ade9b02bfaaa6980118c15
5d973665 -
J-P Nurmi authoredf8099564
-
J-P Nurmi authored
Change-Id: I7cf0a01648d95c386cbf916107546e4f46fadc73 Reviewed-by:
Mitch Curtis <mitch.curtis@qt.io>
772c01c0
Showing
LICENSE.GPL2
0 → 100644
LICENSE.GPL3
0 → 100644
This diff is collapsed.
LICENSE.LGPL3
0 → 100644