summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@theqtcompany.com>2014-11-10 16:05:36 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-11-10 16:20:13 +0100
commita4c77433176d9bd115f005645105f6dab1295e57 (patch)
tree352adf98a95905fd4a649f188ec762c6e864e2aa /tests
parent81d94e618877cc651d2ad02bce9419965374675f (diff)
parente929af148b233526d23cb3bf40d8335c9497c4e7 (diff)
Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into refs/staging/5.4.0
Diffstat (limited to 'tests')
-rw-r--r--tests/quicktestbrowser/quickwindow.qml8
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
+ }
}
}
}