diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-27 18:17:09 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-28 13:54:49 +0100 |
commit | 01dce2df9868fd7ede0fcc7b253f57d1e3d4a101 (patch) | |
tree | 689d6d2dfe262c050f58538d6e63516f676dbd0d /examples/webengine/recipebrowser/resources/qml/main.qml | |
parent | c68c8cb21b47024bbc6c9d15734677318f56ca3f (diff) | |
parent | dad0cfa3eba01b0dff698f457242f80f6eae4698 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/3rdparty
src/core/render_widget_host_view_qt.cpp
src/core/web_contents_view_qt.h
src/core/web_engine_context.cpp
Change-Id: I17f3a4814e88a5680dc61a6d734c171ccba00e8c
Diffstat (limited to 'examples/webengine/recipebrowser/resources/qml/main.qml')
-rw-r--r-- | examples/webengine/recipebrowser/resources/qml/main.qml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/examples/webengine/recipebrowser/resources/qml/main.qml b/examples/webengine/recipebrowser/resources/qml/main.qml index 2639b6b5d..a9893ed67 100644 --- a/examples/webengine/recipebrowser/resources/qml/main.qml +++ b/examples/webengine/recipebrowser/resources/qml/main.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQml 2.0 -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 2.0 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.0 @@ -98,7 +98,7 @@ ApplicationWindow { Layout.fillWidth: true Layout.fillHeight: true focus: true - KeyNavigation.tab: webView + activeFocusOnTab: true onRecipeSelected: function(url) { webView.showRecipe(url) } @@ -109,8 +109,6 @@ ApplicationWindow { Layout.preferredWidth: 2 * parent.width / 3 Layout.fillWidth: true Layout.fillHeight: true - KeyNavigation.tab: recipeList - KeyNavigation.priority: KeyNavigation.BeforeItem // Make sure focus is not taken by the web view, so user can continue navigating // recipes with the keyboard. settings.focusOnNavigationEnabled: false |