aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-07-04 13:35:55 +0200
committerLiang Qi <liang.qi@qt.io>2019-07-04 13:36:52 +0200
commitfa0a2860e9ca7bb035fec21ceb0dfe919c7d0dca (patch)
treed2a90e480d497edc3bbac367bf974ec93076e409 /src/imports/controls
parent13bdd61c6597586f62558ca337c193ce03db26cc (diff)
parent5211cf2843af606b912e9130d44ee6c82eeb40b0 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/imports/controls')
-rw-r--r--src/imports/controls/doc/qtquickcontrols.qdocconf4
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-index.qdoc2
-rw-r--r--src/imports/controls/material/Button.qml3
-rw-r--r--src/imports/controls/material/CursorDelegate.qml2
4 files changed, 6 insertions, 5 deletions
diff --git a/src/imports/controls/doc/qtquickcontrols.qdocconf b/src/imports/controls/doc/qtquickcontrols.qdocconf
index 2a01d058..fd921562 100644
--- a/src/imports/controls/doc/qtquickcontrols.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols.qdocconf
@@ -1,6 +1,8 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
include(manifest-meta.qdocconf)
+moduleheader = QtQuickControls2
+
project = QtQuickControls
description = Qt Quick Controls Reference Documentation
version = $QT_VERSION
@@ -31,7 +33,7 @@ qhp.QtQuickControls.subprojects.examples.title = Examples
qhp.QtQuickControls.subprojects.examples.indexTitle = Qt Quick Controls Examples
qhp.QtQuickControls.subprojects.examples.selectors = fake:example
-depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols1 qtquickextras qmake qtsql qtwidgets qtlabscalendar qtlabsplatform
+depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols1 qtquickextras qmake qtsql qtwidgets qtlabscalendar qtlabsplatform qtgraphicaleffects
# Specify the install path under QT_INSTALL_EXAMPLES
# Note: paths passed to \example command must contain the parent directory, e.g.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index d425f421..452afb18 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -140,7 +140,7 @@
Furthermore Qt Quick Controls 2 potentially contains third party
modules under following permissive licenses:
- \generatelist{groupsbymodule attributions-qtquickcontrols2}
+ \generatelist{groupsbymodule attributions-qtquickcontrols}
\section1 Topics
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 6f7d6c70..04c6664c 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -78,7 +78,6 @@ T.Button {
control.highlighted ? control.Material.primaryHighlightedTextColor : control.Material.foreground
}
- // TODO: Add a proper ripple/ink effect for mouse/touch input and focus state
background: Rectangle {
implicitWidth: 64
implicitHeight: control.Material.buttonHeight
@@ -113,7 +112,7 @@ T.Button {
pressed: control.pressed
anchor: control
active: control.down || control.visualFocus || control.hovered
- color: control.Material.rippleColor
+ color: control.flat && control.highlighted ? control.Material.highlightedRippleColor : control.Material.rippleColor
}
}
}
diff --git a/src/imports/controls/material/CursorDelegate.qml b/src/imports/controls/material/CursorDelegate.qml
index f472e8ae..1626a6fb 100644
--- a/src/imports/controls/material/CursorDelegate.qml
+++ b/src/imports/controls/material/CursorDelegate.qml
@@ -55,7 +55,7 @@ Rectangle {
Timer {
id: timer
- running: cursor.parent.activeFocus && !cursor.parent.readOnly
+ running: cursor.parent.activeFocus && !cursor.parent.readOnly && interval != 0
repeat: true
interval: Qt.styleHints.cursorFlashTime / 2
onTriggered: cursor.opacity = !cursor.opacity ? 1 : 0