From cbd4b0f4e83cd458bd0f1ecbb53f1d789dfe9ff7 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Mon, 3 Jun 2013 10:43:33 +0200 Subject: Doc: Fixes warnings Fixes issues including: - Misspelled links - Links to signal with arguments - \table in SplitView.qml - Links to current file Change-Id: I2cbadf661a641f19ed55f6854922b2b69966bc9c Reviewed-by: Jerome Pasion --- src/controls/ToolButton.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/controls/ToolButton.qml') diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml index d6607d28..6cd3661b 100644 --- a/src/controls/ToolButton.qml +++ b/src/controls/ToolButton.qml @@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0 \qmltype ToolButton \inqmlmodule QtQuick.Controls 1.0 \since QtQtuick.Controls 1.0 - \ingroup applicationwindow + \ingroup controls \brief Provides a button type that is typically used within a ToolBar. ToolButton is functionally similar to \l Button, but can provide a look that is more -- cgit v1.2.1 From eeb3c959334d1e6b4ea9f7538b603a711f8a8262 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Mon, 3 Jun 2013 14:05:26 +0200 Subject: Buttons: Allow overriding of visual properties when 'action' is set Those properties are, text, tooltip, iconName, and iconSource. Also, properly capitalized gallery's tooltips. Change-Id: I1995a85565edd7aaa420279821d7c1a31ef18253 Reviewed-by: J-P Nurmi Reviewed-by: Jens Bache-Wiig --- src/controls/ToolButton.qml | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/controls/ToolButton.qml') diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml index 6cd3661b..3c1eab1a 100644 --- a/src/controls/ToolButton.qml +++ b/src/controls/ToolButton.qml @@ -62,18 +62,6 @@ import QtQuick.Controls.Private 1.0 BasicButton { id: button - /*! The image label source as file name or resource. */ - property url iconSource - - /*! The image label source as theme name. - When an icon from the platform icon theme is found, this takes - precedence over iconSource. - */ - property url iconName - - /*! The label text. */ - property string text - activeFocusOnTab: true Accessible.name: text -- 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/ToolButton.qml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/controls/ToolButton.qml') diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml index 3c1eab1a..3cf32789 100644 --- a/src/controls/ToolButton.qml +++ b/src/controls/ToolButton.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 ToolButton -- 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/ToolButton.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'src/controls/ToolButton.qml') diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml index 3cf32789..3c1eab1a 100644 --- a/src/controls/ToolButton.qml +++ b/src/controls/ToolButton.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 ToolButton -- cgit v1.2.1