From 6de2c97d064daa069066bb46880f04bfd5be43b7 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 29 May 2013 15:23:14 +0200 Subject: Docs: fix missing/leftover docs, types, tags... Task-number: QTBUG-31262 Change-Id: I6bf48604b9392a2a9c63c344363188a4693a8547 Reviewed-by: Jens Bache-Wiig --- src/controls/ProgressBar.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/controls/ProgressBar.qml') diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml index 33e21514..6d9f8be1 100644 --- a/src/controls/ProgressBar.qml +++ b/src/controls/ProgressBar.qml @@ -123,7 +123,7 @@ Control { implicitWidth:(__panel ? __panel.implicitWidth : 0) implicitHeight: (__panel ? __panel.implicitHeight: 0) - /* \internal */ + /*! \internal */ function setValue(v) { var newval = parseFloat(v) if (!isNaN(newval)) { -- cgit v1.2.1 From 420bb714a8c8ebc67ad958897939d7d96e11806c Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Wed, 5 Jun 2013 09:54:28 +0200 Subject: Expose hovered to our controls and document it consistently The current solution is messy and we only expose it partially to some of our styles. I think we should simply expose this to all. Change-Id: Ia546d5657ea416df99c9d9d92cc714b7f1c928fe Reviewed-by: Caroline Chao Reviewed-by: Nico Vertriest --- src/controls/ProgressBar.qml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/controls/ProgressBar.qml') diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml index 6d9f8be1..e472e66e 100644 --- a/src/controls/ProgressBar.qml +++ b/src/controls/ProgressBar.qml @@ -98,6 +98,12 @@ Control { */ property int orientation: Qt.Horizontal + /*! \qmlproperty bool ProgressBar::hovered + + This property indicates whether the control is being hovered. + */ + readonly property alias hovered: hoverArea.containsMouse + /*! \internal */ style: Qt.createComponent(Settings.style + "/ProgressBarStyle.qml", progressbar) @@ -123,6 +129,12 @@ Control { implicitWidth:(__panel ? __panel.implicitWidth : 0) implicitHeight: (__panel ? __panel.implicitHeight: 0) + MouseArea { + id: hoverArea + anchors.fill: parent + hoverEnabled: true + } + /*! \internal */ function setValue(v) { var newval = parseFloat(v) -- cgit v1.2.1 From 41e13d3746c8b7b5cd550091c63fd8ab066422cf Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Tue, 11 Jun 2013 09:13:44 +0200 Subject: Add qml/js files in resource files To make deployment of Qt Quick Controls based applications easier. Task-number: QTBUG-31565 Change-Id: I0b8af2864ef0dc9121eed3189ced64712bdb3d20 Reviewed-by: Friedemann Kleint Reviewed-by: Jens Bache-Wiig --- src/controls/ProgressBar.qml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/controls/ProgressBar.qml') diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml index e472e66e..2270ff49 100644 --- a/src/controls/ProgressBar.qml +++ b/src/controls/ProgressBar.qml @@ -41,6 +41,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 +import QtQuick.Controls.Styles 1.0 /*! \qmltype ProgressBar -- cgit v1.2.1 From 03c7e64ef5f3dfd10d61fd2473fb9f09b124c6e6 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Fri, 14 Jun 2013 15:01:34 +0200 Subject: Revert "Add qml/js files in resource files" We need to investigate more this solution. Deployment issue for Qt Quick Controls will be a known limitation in 5.1.0. This reverts commit 41e13d3746c8b7b5cd550091c63fd8ab066422cf. Change-Id: I501be7494bdbdfbb799d31c612d0c20e7f87ffc7 Reviewed-by: Friedemann Kleint Reviewed-by: Jens Bache-Wiig Reviewed-by: Liang Qi --- src/controls/ProgressBar.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'src/controls/ProgressBar.qml') diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml index 2270ff49..e472e66e 100644 --- a/src/controls/ProgressBar.qml +++ b/src/controls/ProgressBar.qml @@ -41,7 +41,6 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 -import QtQuick.Controls.Styles 1.0 /*! \qmltype ProgressBar -- cgit v1.2.1