diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-10 11:42:10 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-10 11:55:08 +0100 |
commit | e929af148b233526d23cb3bf40d8335c9497c4e7 (patch) | |
tree | a20398847cf22f97c303856b99cb382beff3b593 /tests/quicktestbrowser | |
parent | 0b5a7d6132164994221fd83f70e705772337137e (diff) | |
parent | f343e9d69a9aa8d64fe61725cf17c824f8f2d703 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.4.0
Change-Id: I01615a492c958bf123deeef5d2ddf9fb01b1a9d0
Diffstat (limited to 'tests/quicktestbrowser')
-rw-r--r-- | tests/quicktestbrowser/quickwindow.qml | 8 |
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 + } } } } |