summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@digia.com>2013-12-04 17:07:49 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-04 18:49:49 +0100
commitb57e8b29d7d5125895f65ca36ec74abe0875ceef (patch)
tree15286b73600773d4908aba13b7d7955835966be0
parent2a34659e22ce704101b7e8bc9b667044e801dc19 (diff)
downloadqtquickcontrols-b57e8b29d7d5125895f65ca36ec74abe0875ceef.tar.gz
Make StatusBar and ToolBar focus scopes
The problem is that the content item of both these controls have the focus property set to true. This property will then affect the implicit focus logic and should be protected by a focusscope. Currently adding a ToolBar or StatusBar to an application could result in this content item grabbing focus implicitly even if the application only sets focus: true on a single item. Task-number: QTBUG-34713 Change-Id: I94cb79d25e4cfd727915f5b5ab612ad5c0132db7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
-rw-r--r--src/controls/StatusBar.qml2
-rw-r--r--src/controls/ToolBar.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/StatusBar.qml b/src/controls/StatusBar.qml
index cf41a2dc..5993ce46 100644
--- a/src/controls/StatusBar.qml
+++ b/src/controls/StatusBar.qml
@@ -72,7 +72,7 @@ import QtQuick.Controls.Private 1.0
\endcode
*/
-Item {
+FocusScope {
id: statusbar
activeFocusOnTab: false
diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml
index 1a4c7cb6..caf1d46f 100644
--- a/src/controls/ToolBar.qml
+++ b/src/controls/ToolBar.qml
@@ -76,7 +76,7 @@ import QtQuick.Controls.Private 1.0
\endcode
*/
-Item {
+FocusScope {
id: toolbar
activeFocusOnTab: false