Merge remote-tracking branch 'origin/5.4' into 5.4.0

Change-Id: I01615a492c958bf123deeef5d2ddf9fb01b1a9d0

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/quicktestbrowser/quickwindow.qml b/tests/quicktestbrowser/quickwindow.qml
index f24717b01..6a5ef3187 100644
--- a/tests/quicktestbrowser/quickwindow.qml
+++ b/tests/quicktestbrowser/quickwindow.qml
@@ -70,6 +70,7 @@ ApplicationWindow {
     Settings {
         property alias autoLoadImages: loadImages.checked;
         property alias javaScriptEnabled: javaScriptEnabled.checked;
+        property alias errorPageEnabled: errorPageEnabled.checked;
     }
 
     // Make sure the Qt.WindowFullscreenButtonHint is set on Mac.
@@ -215,6 +216,13 @@ ApplicationWindow {
                             checked: WebEngine.settings.javascriptEnabled
                             onCheckedChanged: WebEngine.settings.javascriptEnabled = checked
                         }
+                        MenuItem {
+                            id: errorPageEnabled
+                            text: "ErrorPage On"
+                            checkable: true
+                            checked: WebEngine.settings.errorPageEnabled
+                            onCheckedChanged: WebEngine.settings.errorPageEnabled = checked
+                        }
                     }
                 }
             }