| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: Ic6cd0450a13b965578a0ab8f590270f4e52ffca6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Utilize the newly introduced qmlRegisterModule() to automatically
register the import version that matches the Qt version that is used
to build the module.
Now we can remove the artificial qmlRegisterRevision() calls, which
were added just to make certain import versions available, even if
there was no such revision.
Change-Id: Ic3887c221c69b6cd299853d8d5869b8af7a314ec
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
| |
Left overs from 1d8bf6d1f4ef0aa84ca7e4c1233bedeee0f606f9.
Change-Id: I53a6916ab3cb8c4effd50ecee1b12662ff7c7402
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/quickcontrols2/qquickstyle.cpp
src/quicktemplates2/qquickslider.cpp
Change-Id: Ie12132690680706def6f516334a6ef0ba27336b3
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/controls/data/tst_button.qml
Change-Id: I5c97b3c1944e52dba44fd3c7d6d9a255c5e08cf7
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The previous phrasing was poor and somewhat confusing. The logical
position is expressed as a fraction of the value, in the range 0-1.
Change-Id: I6c2a4cbb1385af69392d214dd02224ec876131e5
Task-number: QTBUG-57069
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In order to get the ComboBox colors right, it must be possible to query
the original primary text color value. It was very convenient to make
Material.primaryTextColor return custom Material.foreground colors,
because that way we didn't have to touch our QML files, but this
approach is no longer usable.
Task-number: QTBUG-57167
Change-Id: Iee003e96112b919dc7c84a906e4f5691b0f2a6ab
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In 7a8f055, we hid the checkable property from QQuickAbstractButton and
exposed it only in QQuickButton and QQuickMenuItem. The reasoning was
that QQuickCheckBox, QQuickRadioButton, QQuickSwitch and their delegate
counterparts are inherently checkable, so having the checkable property
available in QML didn't seem to make sense.
While this still holds true, there are other factors to take into
consideration. AbstractButton is meant to be a generic base class for
all types of buttons, but the lack of a checkable property makes it
unusable as a base class for custom QML-based checkable buttons.
If we want to a hide the checkable property from CheckBox, RadioButton,
and Switch to avoid having it popup in the auto-completion list, we can
probably do it in a less disruptive way via tooling.
[ChangeLog][Controls][AbstractButton] The checkable property has been
made accessible from QML. Previously it was only exposed for Button and
MenuItem, but it is now available for any AbstractButton to make it
possible to create custom QML-based checkable buttons.
Task-number: QTBUG-51554
Change-Id: I19e29fc87cd15811c43c9b9ebb29701d66cde72f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
For the upcoming editable comboboxes, only the area covered by the indicator
acts as a pressable button. The rest is editor area, which gains focus
on press, but doesn't trigger the popup. The button must be large enough
to be usable on touch.
- Default: the width has been increased from 28 to 40
- Material: the width has been increased from 24 to 40
- Universal: the width is already 32 (which matches with SpinBox)
Task-number: QTBUG-53876
Change-Id: I2312e92947826b03fa28da2e9e9d844325fc7896
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
[ChangeLog][Controls][Styles] Added support for a QT_QUICK_CONTROLS_STYLE_PATH
environment variable, which can be used to specify lookup paths for Qt
Quick Controls 2 styles. This allows device manufacturers and Linux
distributions to specify a system-wide style installation folder that
may be located outside the Qt installation tree.
Change-Id: Ic004d693bf6206971da6319d0cc13061b8fd1566
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\ \ \ |
|
| |\| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/imports/controls/BusyIndicator.qml
src/imports/controls/ProgressBar.qml
src/quicktemplates2/qquickpopup.cpp
src/quicktemplates2/qquickpopup_p_p.h
src/quicktemplates2/qquickstackview.cpp
Change-Id: I9a1028a991de9fc3e26d3f973106301e9ada631c
|
| | |\|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/accessibility/tst_accessibility.cpp
Change-Id: I8c3ccb301730ecdc0acdcb75de607cdd4f753e15
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ia742b82e9aaacb35cdde5087ccb1deb977af51ed
Task-number: QTBUG-55904
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I83703bf0188aa52b873f717b3470ceba4a4d670e
Task-number: QTBUG-55904
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Don't specify the role in QML, because using the Accessible attached
property creates a hard dependency to the accessibility feature (the
QML code won't run when QT_NO_ACCESSIBILITY is defined).
Change-Id: Ie540c915547fae94705873292368652e3608c9e7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-55904
Change-Id: I0c2343238e95a318d97e6d01584714e034696512
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |\|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/imports/controls/Drawer.qml
src/imports/controls/Frame.qml
src/imports/controls/GroupBox.qml
src/imports/controls/Page.qml
src/imports/controls/Pane.qml
src/imports/controls/ToolBar.qml
src/imports/controls/Tumbler.qml
src/quicktemplates2/qquickapplicationwindow.cpp
src/quicktemplates2/qquickpopup.cpp
tests/auto/accessibility/data/busyindicator.qml
tests/auto/accessibility/data/button.qml
tests/auto/accessibility/data/checkbox.qml
tests/auto/accessibility/data/control.qml
tests/auto/accessibility/data/dial.qml
tests/auto/accessibility/data/label.qml
tests/auto/accessibility/data/menu.qml
tests/auto/accessibility/data/pageindicator.qml
tests/auto/accessibility/data/popup.qml
tests/auto/accessibility/data/progressbar.qml
tests/auto/accessibility/data/radiobutton.qml
tests/auto/accessibility/data/rangeslider.qml
tests/auto/accessibility/data/scrollbar.qml
tests/auto/accessibility/data/scrollindicator.qml
tests/auto/accessibility/data/slider.qml
tests/auto/accessibility/data/spinbox.qml
tests/auto/accessibility/data/switch.qml
tests/auto/accessibility/data/tabbar.qml
tests/auto/accessibility/data/tabbutton.qml
tests/auto/accessibility/data/textarea.qml
tests/auto/accessibility/data/textfield.qml
tests/auto/accessibility/data/toolbar.qml
tests/auto/accessibility/data/toolbutton.qml
tests/auto/accessibility/tst_accessibility.cpp
Change-Id: Ibc3f592162e97bef9147b35da8c9a79e73a907e6
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make it running at start to ensure that the first frame serves as a
good screenshot. When GIF animations were disabled (Qt Creator), the
first frame was empty.
Change-Id: I2a0acf0cf428a0175c141a7841ec327bc15dfade
Task-number: QTBUG-55904
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The wireframe is still used on the "Navigation Controls" page.
Change-Id: I8e8c2bf0f5d46179c115d548efda2ea114a4431e
Task-number: QTBUG-55904
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Id90911cbac46d2d68284abca08dc7165ace71113
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ib4c8b5f80e63a322c20caa837632739a3bfee3ee
Task-number: QTBUG-55904
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Id427520a390a2a8cb0bb4ac0f66fef5f96e5b39e
Task-number: QTBUG-55904
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I8494ffe1a46a05a01d31787783b5f8e9cc810f36
Task-number: QTBUG-55904
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In the Gallery example, the back navigation shortcut no longer
activates when the settings dialog or the about dialog is open.
Notice that the back navigation shortcut still activates while
the options menu is open.
[ChangeLog][Controls][Popup] The QML Shortcut type from QtQuick has
been fixed to respect modal popups from QtQuick Controls 2.
Task-number: QTBUG-56562
Change-Id: I4c3c762e9db0935ef250ff9f8c553e7d211220c7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I859bcc03f3f980fd37df756c2922378c0d8c0827
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This allows us to replace the "width: control.popup.width" expressions
with "width: parent.width" to avoid explicit references to the popup.
Next, we are ready to defer the execution of the popup until it becomes
visible or is accessed by the user.
Without the parent item fix, ComboBox throws an error:
ComboBox.qml:58: TypeError: Cannot read property of null
...and tst_snippets fails => tested implicitly. :)
Change-Id: Ib9cfcf7558addbe3403d835d3ae11b6c11c2f0cb
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This allows us to replace all "control.pressed || popup.visible"
expressions with "control.down", and takes us one step closer to
deferred popop execution as mentioned in the previous commit. In
order to be able to defer the popup execution, we must get rid of
such explicit references to the popup.
Change-Id: Ifa7ecf8201912d3ec1bca232e2cf600e3886715e
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Cut the dependency between the popup and its content item.
The same was done for all the built-in styles in 50148c6.
Task-number: QTBUG-56297
Change-Id: I18d83bd5dd92cd4f2798ac17b469725d08368da9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I072079b1fdd0e36fd316d44f3f63a9a4bb29acd9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The plan is to defer the QML execution of the whole ComboBox popup
until the popup is made visible or accessed by the user. This can
slice off roughly half of the creation time.
The QML engine refuses to defer the execution if there are any child
objects that have an identifier, because those child objects could be
referenced from outside the deferred/missing parent object. For this
reason, we must kill the unnecessary ID. This change alone does not
defer anything, but is a prerequisite for enabling deferred execution
later.
Flickable overrides Item's default property to flickableData, which
ensures that children get re-parented to Flickable::contentItem, but
ListView overrides the default property back to Item::data, so the
parent assignment is not necessary at all. The rest can be done by
referencing parent instead of the ID.
The other styles do not have ID's within the popup.
Change-Id: Iac58bae7e99252fb03bed2228153483300901720
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ia075694a7dc43d72d07221b569467fcebdb411fb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The text field of an editable ComboBox must cover the whole control
excluding the indicator button. This ensures that user interaction
works as expected over the whole editor area (there must be no "dead"
paddings), and that the whole editor area gets the appropriate caret
or ibeam mouse cursor.
Previously, the indicator was laid out inside/over the content item.
To help with getting the layout right, this change injects empty
padding into the indicator images of the Universal and Material styles
(the Default style already had padding).
Task-number: QTBUG-53876
Change-Id: I62e10ffb7f5ed4559523513f04ff7e2ea0e57ef5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/quicktemplates2/qquickpopup.cpp
src/quicktemplates2/qquickpopup_p_p.h
Change-Id: I33241dfd15a320e6ae2f0c056252b0ec6be7c6f6
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/imports/controls/CheckIndicator.qml
src/imports/controls/RadioIndicator.qml
src/imports/controls/RangeSlider.qml
src/imports/controls/Slider.qml
src/imports/controls/SwitchIndicator.qml
Change-Id: I32612d2f905ffa02dbaedbb1f84c8237fbd66db3
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I2c3f101182f8b985180695f6cf3c6baabe9969ed
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This way, users have control over the opacity of child items.
Change-Id: Ie7c0b08eb0b22d11319f8c2f1807e6a3a68790ea
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-56698
Change-Id: I8e82ee2f2f9c38755e49b6f1b46e9f83a1363463
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This allows us, in theory, to test multiple styles in the same process
by calling qmlClearTypeRegistrations() between each style test round.
When QML types are cleared, QML plugins are unloaded, and the current
style plugin's proxy platform theme is destroyed. It leads to a nasty
crash if there are fonts stored in the Qt font database that have their
family names stored in the read-only data of an unloaded plugin.
Change-Id: I32a70077ac4502e16a753fb68f7efeef35d239b5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This helps to get the dialog layout right (a separate follow-up
commit), because we don't need to mess with the paddings of the
header, content, and footer, based on their existence and visibility,
but we can also adjust the spacing which gets automatically added
between the building blocks when they exist and are visible.
Change-Id: Ie8b587eeb9d0fb4a8f42baf957879d40bbd3385c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I03996d592de4b7db29b671fa73ab44036a80fa2f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add spacing support into QQuickPageLayout. Having spacing and padding
separately gives more fine-grained control over the layout. Spacing is
inserted between the header, content, and footer, but only when the
respective building blocks are visible.
Change-Id: Ia26a4c33c2756a603ca6d53aefac3a66414b36d3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I91b578e6e7956feadb0a9f874fa0c1f4d97f02bf
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Dialog is incomplete without built-in support for title. All dialogs in
the examples, screenshots, webinars, and blog posts have had a custom
title. The Material and Universal designs both have specs for dialog
titles. This commit adds support for dialog titles with appropriate
looks (padding & font) out of the box.
Task-number: QTBUG-56711
Change-Id: I248150313f1ce629a7105fdbe1c70c8fcd69e1cc
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Just fill in the footer with a button box by default from the styles.
This makes the next step easier, to provide also a default title bar
in the header.
Task-number: QTBUG-56711
Change-Id: I621a61f29f9ba2fe4b7e907d81da5988133a98c8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Duplicate code in TextField, TextArea, and SpinBox. The next one is
editable ComboBox.
Change-Id: Ibbd054d2f945f4964ee0007f9e9dc8a9450902e9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In QQC1 the attached property was called "Stack", purely because we
couldn't have both QML and C++ types with the same name. Now the
attached properties are provided by StackView itself, so this is the
correct name.
Change-Id: I0f98d73735cff14c444a9e843b7cb56dc8a45cd8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: If48d66d89172db94ee1839063396156a3a947601
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
src/imports/controls/material/ComboBox.qml
Change-Id: I2a57070f96691cb6bbdaae460fbc60a85be435de
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The "Styling Qt Quick Controls 2" -page is already overloaded with
content. Give a minimal one-liner example and link to QQuickStyle
for more details, which contains the same snippet that was removed.
Change-Id: I77e196aeb8d407fcf05a264232dd83c2e28f97b7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|