From bc11edeafbc606c54e36cfd8d93451412e9b3c14 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 22 Jul 2013 13:33:43 +0200 Subject: Add changes-5.1.1 file Change-Id: I46067675a2b6a336b787b69caf44a5fd62c8e41f Reviewed-by: Jens Bache-Wiig --- dist/changes-5.1.1 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 dist/changes-5.1.1 diff --git a/dist/changes-5.1.1 b/dist/changes-5.1.1 new file mode 100644 index 00000000..7f01a404 --- /dev/null +++ b/dist/changes-5.1.1 @@ -0,0 +1,28 @@ +Qt 5.1.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.1.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.1/ + +The Qt version 5.1 series is binary compatible with the 5.0.x series. +Applications compiled for 5.0 will continue to run with 5.1. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* General * +**************************************************************************** + + - [QTBUG-31206] TableView: let delegates handle mouse events + - [QTBUG-31306] GroupBox: fix the activeFocusOnTab behavior + - [QTBUG-31992] Make ComboBox work with variant list + - [QTBUG-32400] Allow mouse events when transient scroll bars are hidden -- cgit v1.2.1 From d5656fbc4f96ac176abb531a4c8997c57dcea9c9 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 2 Aug 2013 14:38:27 +0200 Subject: QQuickTooltip should not crash if widget implementation isn't possible It's not enough to check for QT_NO_WIDGETS because it can fail at runtime if the app was launched with a QGuiApplication or you are on a platform without multiple-window support. Task-number: QTBUG-32779 Change-Id: I13abf9a5063f7d91277bc52b8be79bee19e746af Reviewed-by: J-P Nurmi --- src/private/qquicktooltip.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/private/qquicktooltip.cpp b/src/private/qquicktooltip.cpp index e76fa3ad..ae4366d9 100644 --- a/src/private/qquicktooltip.cpp +++ b/src/private/qquicktooltip.cpp @@ -42,6 +42,8 @@ #include "qquicktooltip_p.h" #include #include +#include +#include #ifndef QT_NO_WIDGETS #include @@ -60,7 +62,10 @@ void QQuickTooltip::showText(QQuickItem *item, const QPointF &pos, const QString if (!item || !item->window()) return; #ifndef QT_NO_WIDGETS - QToolTip::showText(item->window()->mapToGlobal(item->mapToScene(pos).toPoint()), str); + if (QGuiApplicationPrivate::platformIntegration()-> + hasCapability(QPlatformIntegration::MultipleWindows) && + QCoreApplication::instance()->inherits("QApplication")) + QToolTip::showText(item->window()->mapToGlobal(item->mapToScene(pos).toPoint()), str); #else Q_UNUSED(item); Q_UNUSED(pos); -- cgit v1.2.1 From b8abaebb5b4309ffb6d3e559ec422ef5cd527496 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 6 Aug 2013 11:46:32 +0200 Subject: ScrollBar: support wheel scrolling Task-number: QTBUG-32763 Change-Id: Ia37fa5f8021346a4cbeedd2f404e88476d9e7bd3 Reviewed-by: Caroline Chao --- src/private/ScrollBar.qml | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/src/private/ScrollBar.qml b/src/private/ScrollBar.qml index 5257fe80..c21d6562 100644 --- a/src/private/ScrollBar.qml +++ b/src/private/ScrollBar.qml @@ -182,28 +182,40 @@ Item { pageDownPressed = false; } - function incrementPage() { - value += pageStep - if (value > maximumValue) - value = maximumValue + onWheel: { + var stepCount = -(wheel.angleDelta.x ? wheel.angleDelta.x : wheel.angleDelta.y) / 120 + if (stepCount != 0) { + if (wheel.modifiers & Qt.ControlModifier || wheel.modifiers & Qt.ShiftModifier) + incrementPage(stepCount) + else + increment(stepCount) + } + } + + function incrementPage(stepCount) { + value = boundValue(value + getSteps(pageStep, stepCount)) + } + + function decrementPage(stepCount) { + value = boundValue(value - getSteps(pageStep, stepCount)) + } + + function increment(stepCount) { + value = boundValue(value + getSteps(singleStep, stepCount)) } - function decrementPage() { - value -= pageStep - if (value < minimumValue) - value = minimumValue + function decrement(stepCount) { + value = boundValue(value - getSteps(singleStep, stepCount)) } - function increment() { - value += singleStep - if (value > maximumValue) - value = maximumValue + function boundValue(val) { + return Math.min(Math.max(val, minimumValue), maximumValue) } - function decrement() { - value -= singleStep - if (value < minimumValue) - value = minimumValue + function getSteps(step, count) { + if (count) + step *= count + return step } RangeModel { -- cgit v1.2.1 From 0bf9c1c5b27009bae612cbef24e76e9e4ad60768 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 6 Aug 2013 14:21:27 +0200 Subject: Base/ButtonStyle: fix the background of checked buttons Task-number: QTBUG-32542 Change-Id: I15b9a62b1daad14a591d9e46f15a754ec230e700 Reviewed-by: Gabriel de Dietrich --- src/styles/Base/ButtonStyle.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/Base/ButtonStyle.qml b/src/styles/Base/ButtonStyle.qml index 7721fdf2..aea5f721 100644 --- a/src/styles/Base/ButtonStyle.qml +++ b/src/styles/Base/ButtonStyle.qml @@ -99,7 +99,7 @@ Style { implicitHeight: 25 BorderImage { anchors.fill: parent - source: control.pressed ? "images/button_down.png" : "images/button.png" + source: control.pressed || (control.checkable && control.checked) ? "images/button_down.png" : "images/button.png" border.top: 6 border.bottom: 6 border.left: 6 -- cgit v1.2.1 From 8553e0007b8c1aeebb857b908e974bb512d70fda Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 6 Aug 2013 17:43:56 +0200 Subject: Add missing styleData properties to TableViewColumn::delegate docs Task-number: QTBUG-32503 Change-Id: Ic93fd95af650db0be000b0efb762e7483277147c Reviewed-by: Shawn Rutledge --- src/controls/TableViewColumn.qml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml index f1abc553..d976c691 100644 --- a/src/controls/TableViewColumn.qml +++ b/src/controls/TableViewColumn.qml @@ -93,7 +93,19 @@ QtObject { property int horizontalAlignment: Text.AlignLeft /*! The delegate of the column. This can be used to set the - \l TableView::itemDelegate for a specific column. */ + \l TableView::itemDelegate for a specific column. + + In the delegate you have access to the following special properties: + \list + \li styleData.selected - if the item is currently selected + \li styleData.value - the value or text for this item + \li styleData.textColor - the default text color for an item + \li styleData.row - the index of the row + \li styleData.column - the index of the column + \li styleData.elideMode - the elide mode of the column + \li styleData.textAlignment - the horizontal text alignment of the column + \endlist + */ property Component delegate Accessible.role: Accessible.ColumnHeader -- cgit v1.2.1 From 19c9ad7f109a8358c66008517b7535d99237424e Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 7 Aug 2013 09:53:20 +0200 Subject: Base/ToolButtonStyle: fix the background of checked buttons Task-number: QTBUG-32542 Change-Id: Idcad5f016830f63dae46167ab8a8cd979234a3b2 Reviewed-by: Caroline Chao --- src/styles/Base/ToolButtonStyle.qml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/styles/Base/ToolButtonStyle.qml b/src/styles/Base/ToolButtonStyle.qml index 0ead0750..d6de68e0 100644 --- a/src/styles/Base/ToolButtonStyle.qml +++ b/src/styles/Base/ToolButtonStyle.qml @@ -56,11 +56,8 @@ Style { Rectangle { anchors.fill: parent - visible: control.pressed - gradient: Gradient{ - GradientStop{color: control.pressed ? "lightgray" : "white" ; position: 0} - GradientStop{color: control.pressed ? "lightgray" : "lightgray" ; position: 1} - } + visible: control.pressed || (control.checkable && control.checked) + color: "lightgray" radius:4 border.color: "#aaa" } -- cgit v1.2.1 From b9936b9628b5cc450290186159c3e3fe7485ab22 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 7 Aug 2013 10:08:01 +0200 Subject: Base/ToolButtonStyle: fix panel's implicit size for textual buttons Change-Id: Id94be2cf585750c6004d78c0e1b808f30a281bb2 Reviewed-by: Caroline Chao --- src/styles/Base/ToolButtonStyle.qml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/styles/Base/ToolButtonStyle.qml b/src/styles/Base/ToolButtonStyle.qml index d6de68e0..280740e4 100644 --- a/src/styles/Base/ToolButtonStyle.qml +++ b/src/styles/Base/ToolButtonStyle.qml @@ -51,8 +51,10 @@ Style { readonly property ToolButton control: __control property Component panel: Item { id: styleitem - implicitWidth: 36 - implicitHeight: 36 + implicitWidth: hasIcon ? 36 : Math.max(label.implicitWidth + frame.border.left + frame.border.right, 36) + implicitHeight: hasIcon ? 36 : Math.max(label.implicitHeight, 36) + + readonly property bool hasIcon: icon.status === Image.Ready || icon.status === Image.Loading Rectangle { anchors.fill: parent @@ -63,7 +65,7 @@ Style { } Text { id: label - visible: icon.status != Image.Ready + visible: !hasIcon anchors.centerIn: parent text: control.text } @@ -73,6 +75,7 @@ Style { source: control.iconSource } BorderImage { + id: frame anchors.fill: parent anchors.margins: -1 anchors.topMargin: -2 -- cgit v1.2.1