| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
examples/quickcontrols2/quickcontrols2.pro
src/imports/controls/ComboBox.qml
src/quicktemplates2/qquickabstractbutton.cpp
src/quicktemplates2/qquickabstractbutton_p.h
src/quicktemplates2/qquickapplicationwindow_p.h
src/quicktemplates2/qquickcombobox.cpp
src/quicktemplates2/qquickcontainer.cpp
src/quicktemplates2/qquickcontrol.cpp
src/quicktemplates2/qquickcontrol_p.h
src/quicktemplates2/qquickcontrol_p_p.h
src/quicktemplates2/qquicklabel_p.h
src/quicktemplates2/qquicklabel_p_p.h
src/quicktemplates2/qquickslider_p.h
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquicktextarea_p.h
src/quicktemplates2/qquicktextarea_p_p.h
src/quicktemplates2/qquicktextfield_p.h
src/quicktemplates2/qquicktextfield_p_p.h
tests/auto/auto.pro
tests/auto/controls/data/tst_combobox.qml
Change-Id: I34cdd5a9794e34e0f38f70353f2a2d04dfc11074
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In practice, deferring the execution of the delegates (until
accessed) means that the default delegate item does not get created
at all, when a custom control replaces it at construction time.
Button {
background: Rectangle { ... }
}
Before, such custom Button would never be faster than the original
one, because the default delegate was first created and then thrown
away at construction time. Originally, this was not considered a huge
problem, because the plan was to keep the default delegates so light-
weight that it wouldn't matter. However, then came the fancy styles
with shadows and effects and thus, heavier default delegates. There's
also a growing demand for more features, and the default delegates
are slowly getting heavier...
Now, after this patch, if you replace a heavy default delegate with
a light and simple custom delegate, the result is a much faster
control. For example, replacing Material style Button's background,
which has a shadow effect, with a plain Rectangle gives a ~10x boost,
because the default background with its heavy shadow effect is not
executed at all.
At the same time, deferring the execution of the default delegates
avoids troubles with asynchronous incubation, because we don't need
to destroy an object in the middle of the incubation process.
Task-number: QTBUG-50992
Change-Id: I2274bff99b9ff126d3748278d58d859222910c98
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I696b405843f9eda79ec586cb99953469cb7f3c86
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
tests/auto/auto.pro
tests/auto/qquickmenu/tst_qquickmenu.cpp
tests/auto/qquickpopup/tst_qquickpopup.cpp
Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
|
| |
| |
| |
| |
| | |
Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: If9fc2bb41cf251af71479b25656240e0d3c238d8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I98f7081e94672a4454c33841934158ae82e9388f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I186b3ed95eda5178f861bc501be481c971641767
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ifc195a5b9ca69223afe35b9ac332238e0c163e3d
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The Imagine style is based on image assets. The style comes with a
default set of images, but the images can be easily changed by
providing a directory with images using a predefined naming convention.
[ChangeLog][Controls] Added the Imagine style, which is based on
image assets that can be provided using a predefined naming convention.
Task-number: QTPM-517
Change-Id: I550d7dac9a9686d60bec15655ac92dea9f36149c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
MenuBar is an ordinary Item. It can be located basically anywhere, but
the idea is to introduce a new ApplicationWindow::menuBar property in a
follow-up commit. Currently the example snippets are using the header
property.
[ChangeLog][Controls][MenuBar] Introduced a MenuBar control.
Task-number: QTBUG-60350
Change-Id: Ie66dc457a3d8edbe8362fab2a591dc49442c95e2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
src/quicktemplates2/qquickapplicationwindow.cpp
src/quicktemplates2/qquickmenu.cpp
src/quicktemplates2/qquickmenu_p.h
src/quicktemplates2/qquickpopup.cpp
tests/auto/auto.pro
Change-Id: I856a022d38abd84763127539f46ef032ddc53c3d
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
1) First of all, Popup's QObject-parent depends on the way the Popup
is declared in QML, or what is passed as a parent to createObject()
when creating dynamic instances. For example:
- Popup becomes a QObject child of of the contentItem:
ApplicationWindow {
Popup { }
}
- Popup becomes a QObject child of the window:
ApplicationWindow {
Item {
Popup { }
}
}
- Popup becomes a QObject child of the specified parent:
ApplicationWindow {
Component {
id: component
Popup { }
}
Component.onComplete: component.createObject(overlay)
}
Since QQuickWindow and QQuickView did not set the QObject-parent
of their contentItem and rootObject, respectively, we had troubles
finding popup instances, because window->findChildren<QQuickPopup>()
and window->contentItem()->findChildren<QQuickPopup>() would produce
inconsistent results. This has been fixed in qtdeclarative commit
af6655885, so now we can use window->findChildren() reliably.
2) Popups inherit font from the associated window, not the parent item.
It was wrong to call resolveFont() in setParentItem(), because the
parent item might not change even though the associated window does.
The piece of code was moved to setWindow() instead.
3) QQuickPopupItemPrivate::resolveFont() did not propagate the
default font at all when the font was resolved before being associated
to a window.
4) After the above fixes had been applied, to ensure that popups always
inherit fonts and propagate them down to children as appropriate, we
got a new test failure in tst_controls::Popup::test_font() indicating
that there were extra font change notifiers triggered at creation time.
This was fixed by associating "top-level" popups with the window as
soon as they are appended to ApplicationWindow's default property,
instead of waiting until the popup is complete and then doing a lookup
in the parent hierarchy.
Task-number: QTBUG-61114
Change-Id: I6185c76d50835cb7a06b03db0a3ac9ddad64bdd3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
[ChangeLog][Controls] Introduced a Fusion style that offers
a platform agnostic desktop-oriented look'n'feel.
Change-Id: Id1c1baf10f4b3a79e89bcc72f6d170ed0b2cc8b0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Icd965d8a79f022f4375e2134621cbc3897014015
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I7577d826eff0ba819ad711d402083c736b29d847
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/templates/qtquicktemplates2plugin.cpp
Change-Id: I4a07d331163a85a0fb98a5f58f3970863f8da0fc
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This test was added in 88a62b3 that fixed the scrollbar cursor. It was
not possible to test in QML, so a separate C++ test was added. It was
noticed that most interactive controls have the exact same issue, so we
want to utilize the same test for testing the cursors of all relevant
controls.
Change-Id: I7c307de9f72760b0993007246beb3357a1b5ec2b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/controls/RangeSlider.qml
Change-Id: I0b930583135f044cb690217c026e6a120b73fcb7
|
| |
| |
| |
| |
| | |
Change-Id: I3e287b85517c04803964c068e32bf8b6bcae5cb6
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|/
|
|
|
| |
Change-Id: I4c09c932e75ead95cf009f28a2dcfe24659000a8
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
./configure
[...]
Qt Quick Controls 2:
Styles ................................. Default Material Universal
Supports both syntaxes:
-(no-)style-[material|universal]
-(no-)feature-quickcontrols2-[material|universal]
Change-Id: I011cc38e5752d2c718376ca7493940271920b3e1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
./configure -no-feature-quicktemplates2-hover
[...]
Qt Quick Templates 2:
Hover support .......................... no
Change-Id: I0509a1a9ac3ffe2cbfe4f2016ce0345708860b84
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
examples/quickcontrols2/quickcontrols2.pro
Change-Id: If2f5e40487ba6515ba322f92380573727bdd6bc0
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This example shows how to integrate custom styled
components with tooling. The example uses states in the styling items,
so they can be easily edited and checked in the designer.
Change-Id: Ie665bb3938cdb1b135dbbd4163e1b901e61a6be0
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ibab960ddd073ddcdfbf2b6e4492882662c7021b5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|/
|
|
|
|
| |
Task-number: QTBUG-53169
Change-Id: I1d84d2fc9cbfce0fa71703f469bb6d5030e41d67
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: Ib6ebd0d076309f2d22368223bb323547aed33f3a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml
src/quicktemplates2/qquickmenu.cpp
tests/auto/controls/data/tst_buttongroup.qml
tests/auto/controls/data/tst_swipedelegate.qml
Change-Id: Ib6042a0ad716f557927e7412d17ea8957d06c015
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This can be used to take screenshots of items loaded from snippets,
without the window frame being included as would be the case if
using e.g. qmlscene.
Change-Id: I376148a66a26be846c102e768ffade204cea448b
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/quicktemplates2/qquicktextarea_p_p.h
src/quicktemplates2/qquicktextfield_p_p.h
Change-Id: Ie7b4a114ad27a4cad337c91e8ebcf696b0e845d7
|
| |
| |
| |
| |
| | |
Change-Id: Ibdad75be0d08c7e737af3a2ba6c096b3a9a2186f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ie23caad334346a87703655fd83c447447bbfbce0
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ic9b8866cb353a14bbcc9005ef7a419fe1629dc34
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It's a bit of extra hassle, but the type registration can be done so
that we keep the old version available to avoid deliberately breaking
apps that have had to import .impl to gain access to the internal
goodies. For example, someone may have made a copy of one of the
controls as our documentation suggests. :)
Change-Id: I5308d7e74ecebf69da7fe9c6912380f72c3c9a2b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ie451be17e785dc8551304dcfb0b2c8552023bdba
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Buttons have so many different states that it's useful have a test app
that can be used to visualize various states in different themes.
Change-Id: Ia714c1d769aa13529c3117852b0d9b625a50d7d0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|/
|
|
|
|
|
|
|
| |
This change just prepares the infrastructure and imports an icon
loader helper that will be used for the platform menu, dialog, and
system tray icon implementations.
Change-Id: I34a93050a7c988134c3daa986aca6021eac7a4d1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The CI was not able to catch failures in tst_styles, because the test
results were output by separate child processes. This change builds
three different versions of tst_controls, which each run with the
appropriate style.
Change-Id: I95b2bdd90221579a3176e827802236d80d9f1a09
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
These test specificly the QQuickMaterialStyle and QQuickUniversalStyle
implementations, so rename appropriately to make room for the upcoming
tst_material and tst_universal tests. See the next commit for more
details about that.
Change-Id: I08d6116d6219084f6087682b7e712f8499a0e945
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: Ib5a985796d56b66c5842f2e1ab0e460420f62b54
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This makes it possible to pass a relative path to the style:
./myapp -style relative/path/to/my/style
To make the tests pass, includes a fix to avoid double slashes in
selected URLs.
Change-Id: I1b366eb7793523dd0f1058236661cedaa1216f3d
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Fixes the issue that "./app -style material" did no longer work,
but the case had to match exactly (./app -style Material).
Change-Id: I446654110af670c391f8e304ce8008fbd6e9acaa
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
The position on the right and bottom edges is relative to the size of
the window, not the drawer itself.
Change-Id: Ia1d7418d4091a3a9e26f691bd75448023e0ca1cf
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
| |
Change-Id: Iaca71ec9a4281353bca0d7227f9c4e08ac5a4477
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
| |
Change-Id: Ib209b03133309069d7bef5df77acf7b50e0e9698
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: Ia4365ff05d59920143d6288b47c383a202eba772
Task-number: QTBUG-50787
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I056acffe44031cfae7b3a4080860b58a15a3a805
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/controls/universal/ToolButton.qml
Change-Id: Ib9f1e7d83fb824d9e6a13a2bc429d1a5642fe4f6
|
| |
| |
| |
| |
| | |
Change-Id: Iff06544f14964e442b66901d5c23254786008293
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|