summaryrefslogtreecommitdiffstats
path: root/examples/webengine
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-03-29 13:23:29 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-03-29 13:23:29 +0100
commitf962cadf8dd0a7aee59573896148c0ea96bd5503 (patch)
tree6252c88c55ee1c9a66a316f95f80c5a29de01875 /examples/webengine
parent1b780f07367ad98f1d812479a659d736d65ef54a (diff)
parent3fc220377455cb15a7e65cfc63707df552650887 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Diffstat (limited to 'examples/webengine')
-rw-r--r--examples/webengine/recipebrowser/resources/pages/burger.html1
-rw-r--r--examples/webengine/recipebrowser/resources/pages/cupcakes.html1
-rw-r--r--examples/webengine/recipebrowser/resources/pages/pasta.html1
-rw-r--r--examples/webengine/recipebrowser/resources/pages/pizza.html1
-rw-r--r--examples/webengine/recipebrowser/resources/pages/skewers.html1
-rw-r--r--examples/webengine/recipebrowser/resources/pages/soup.html1
-rw-r--r--examples/webengine/recipebrowser/resources/pages/steak.html1
-rw-r--r--examples/webengine/recipebrowser/resources/qml/RecipeList.qml2
-rw-r--r--examples/webengine/recipebrowser/resources/qml/main.qml6
9 files changed, 10 insertions, 5 deletions
diff --git a/examples/webengine/recipebrowser/resources/pages/burger.html b/examples/webengine/recipebrowser/resources/pages/burger.html
index b10170cbd..6651cc0f0 100644
--- a/examples/webengine/recipebrowser/resources/pages/burger.html
+++ b/examples/webengine/recipebrowser/resources/pages/burger.html
@@ -11,6 +11,7 @@
<div id="content">
<img src="images/burger.jpg" alt="Insanity Burger" title="Insanity Burger" />
+
Insanity burger
===============
diff --git a/examples/webengine/recipebrowser/resources/pages/cupcakes.html b/examples/webengine/recipebrowser/resources/pages/cupcakes.html
index e21247825..4791c7ffa 100644
--- a/examples/webengine/recipebrowser/resources/pages/cupcakes.html
+++ b/examples/webengine/recipebrowser/resources/pages/cupcakes.html
@@ -11,6 +11,7 @@
<div id="content">
<img src="images/cupcakes.jpg" alt="Cupcakes" title="Cupcakes" />
+
Cupcakes
=============
diff --git a/examples/webengine/recipebrowser/resources/pages/pasta.html b/examples/webengine/recipebrowser/resources/pages/pasta.html
index 4de65292e..41ed1a756 100644
--- a/examples/webengine/recipebrowser/resources/pages/pasta.html
+++ b/examples/webengine/recipebrowser/resources/pages/pasta.html
@@ -11,6 +11,7 @@
<div id="content">
<img src="images/pasta.jpg" alt="Pasta" title="Pasta" />
+
Pasta
=============
diff --git a/examples/webengine/recipebrowser/resources/pages/pizza.html b/examples/webengine/recipebrowser/resources/pages/pizza.html
index c63102934..348d809e8 100644
--- a/examples/webengine/recipebrowser/resources/pages/pizza.html
+++ b/examples/webengine/recipebrowser/resources/pages/pizza.html
@@ -11,6 +11,7 @@
<div id="content">
<img src="images/pizza.jpg" alt="Pizza Diavola" title="Pizza Diavola" />
+
Pizza Diavola
=============
diff --git a/examples/webengine/recipebrowser/resources/pages/skewers.html b/examples/webengine/recipebrowser/resources/pages/skewers.html
index 6fbf90cb4..aca4c4859 100644
--- a/examples/webengine/recipebrowser/resources/pages/skewers.html
+++ b/examples/webengine/recipebrowser/resources/pages/skewers.html
@@ -11,6 +11,7 @@
<div id="content">
<img src="images/skewers.jpg" alt="Grilled skewers" title="Grilled skewers" />
+
Grilled skewers
======================
diff --git a/examples/webengine/recipebrowser/resources/pages/soup.html b/examples/webengine/recipebrowser/resources/pages/soup.html
index e99f016cf..1b7027e5d 100644
--- a/examples/webengine/recipebrowser/resources/pages/soup.html
+++ b/examples/webengine/recipebrowser/resources/pages/soup.html
@@ -11,6 +11,7 @@
<div id="content">
<img src="images/soup.jpg" alt="Soup" title="Soup" />
+
Soup
=============
diff --git a/examples/webengine/recipebrowser/resources/pages/steak.html b/examples/webengine/recipebrowser/resources/pages/steak.html
index c58395d10..a56313e27 100644
--- a/examples/webengine/recipebrowser/resources/pages/steak.html
+++ b/examples/webengine/recipebrowser/resources/pages/steak.html
@@ -11,6 +11,7 @@
<div id="content">
<img src="images/steak.jpg" alt="Grilled steak and rice" title="Grilled steak and rice" />
+
Grilled steak and rice
======================
diff --git a/examples/webengine/recipebrowser/resources/qml/RecipeList.qml b/examples/webengine/recipebrowser/resources/qml/RecipeList.qml
index 24be23a64..41806986c 100644
--- a/examples/webengine/recipebrowser/resources/qml/RecipeList.qml
+++ b/examples/webengine/recipebrowser/resources/qml/RecipeList.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 2.0
import QtQuick.Controls.Material 2.0
import QtQuick.Layouts 1.0
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