diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-01 13:18:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-01 13:19:21 +0200 |
| commit | 14e08bafc88824f3d16602b04b5e60ae8c4005b0 (patch) | |
| tree | 47a831782fe60e26e6bba7ff8e5a0c3ac0a81c42 /src/quicktemplates2/qquickswitch.cpp | |
| parent | 2ebb1fdcafaba9d3b0e7fbb42ccd5c3ffde38fbf (diff) | |
| parent | ceaf6177a8be6db22e629ff05a625e278025b071 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Comparing colors in tst_material.qml works fine now.
Conflicts:
examples/quickcontrols2/gallery/qtquickcontrols2.conf
tests/auto/material/data/tst_material.qml
Task-number: QTBUG-53556
Change-Id: I59970442a09bd72bf0ce53fe838c560ca8daf325
Diffstat (limited to 'src/quicktemplates2/qquickswitch.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickswitch.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp index 380c37ec..439950d8 100644 --- a/src/quicktemplates2/qquickswitch.cpp +++ b/src/quicktemplates2/qquickswitch.cpp @@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE \inherits AbstractButton \instantiates QQuickSwitch \inqmlmodule QtQuick.Controls + \since 5.7 \ingroup qtquickcontrols2-buttons \brief An option button that can be toggled on or off. |