| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The tests for boot2qt were disabled with commit
555750221ee3850ba70169a2b6854041b434c592. The tests can
be enabled since qtdeclarative now fallbacks to software
renderer if OpenGL is not supported.
Changes needed:
- Using grabImage does not work correctly on offscreen platform, so
tests relying on it are skipped
- Extra 1ms delay is needed between two mouse clicks to get rid of
test_activeFocusOnPress() flakiness on software quick renderer
Change-Id: Ie985110c171bc395bac0d63cd2fbb94207c63516
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/quickcontrols/extras/flat/main.cpp
src/controls/Private/qquickcontrolsettings.cpp
Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Let QML TestCase be implicitly shown together with the internal test
window. The visibility binding to windowShown is unnecessary, and might
cause extra visibility state changes, which in turn may cause other
issues further down the chain.
Change-Id: I59654c4035185ddcbc1e2c4c231f9a6d76d12383
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|/
|
|
|
|
|
| |
Updated BSD license headers
Change-Id: I73d67dbc6dbbe7c58d2b9c301b46fb6163243095
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: Ie45c9b8d5a5d7f92e4b835473b0c76e3a83998b5
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Removes the duplicated style settings functionality in Extras and
simplifies the installed styles directory structure.
- Extras' Base style is now part of Controls' Base style, eliminating
the need for a separate QtQuick.Extras.Styles import. The cost of
doing this should be negligible: a few QML files and two images.
If we didn't merge Extras' Baste style into Controls', we'd need
extras-specific code in qquickcontrolssettings, as the default style
search path is:
qml/QtQuick/Controls/Styles/
Whereas the Extras Base style would be in:
qml/QtQuick/Extras/Styles/
The Extras Base style can't go into Controls' Base style directory,
either, because otherwise we'd have two qmldir files there.
The Flat style doesn't have this problem because it is all contained
in one plugin and gets installed into its own Flat/ folder.
- Documentation now lists the Extras controls as \since QtQuick.Extras
1.4.
- Adds the customcontrolsstyle auto test to ensure that custom styling
is tested.
Change-Id: I19ca7a8b7e1c1daa85b272f4ccf9a2f05c76e0d9
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
Change-Id: I59c5c97c564f707da4ce617e25e13ff8124f7d4b
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|