summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2014-08-20 15:48:42 +0200
committerAllan Sandfeld Jensen <allan.jensen@digia.com>2014-09-02 22:48:54 +0200
commitce7797dadce021c7da5d18a9b945100ae08c8224 (patch)
treefa7188322f881e4f6b245ac8502e010dc32d86ac
parenteb3406bbb52fdbc68e9155cc839c1c82d40075f4 (diff)
Settings in test browser
Expose some "testable" settings as well as test the integration with the QML Settings API. Change-Id: I7ec6a7e695f60338b2c16a648e9a93b64ea29a94 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r--tests/quicktestbrowser/quickwindow.qml27
1 files changed, 27 insertions, 0 deletions
diff --git a/tests/quicktestbrowser/quickwindow.qml b/tests/quicktestbrowser/quickwindow.qml
index ca1f75c04..f24717b01 100644
--- a/tests/quicktestbrowser/quickwindow.qml
+++ b/tests/quicktestbrowser/quickwindow.qml
@@ -41,11 +41,14 @@
import QtQuick 2.1
import QtWebEngine 1.0
import QtWebEngine.experimental 1.0
+
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
import QtQuick.Layouts 1.0
import QtQuick.Window 2.1
import QtQuick.Controls.Private 1.0
+import Qt.labs.settings 1.0
+
ApplicationWindow {
id: browserWindow
@@ -64,6 +67,11 @@ ApplicationWindow {
visible: true
title: currentWebView && currentWebView.title
+ Settings {
+ property alias autoLoadImages: loadImages.checked;
+ property alias javaScriptEnabled: javaScriptEnabled.checked;
+ }
+
// Make sure the Qt.WindowFullscreenButtonHint is set on Mac.
Component.onCompleted: flags = flags | Qt.WindowFullscreenButtonHint
@@ -190,6 +198,25 @@ ApplicationWindow {
text: currentWebView && currentWebView.url
onAccepted: currentWebView.url = utils.fromUserInput(text)
}
+ ToolButton {
+ id: settingsMenuButton
+ menu: Menu {
+ MenuItem {
+ id: loadImages
+ text: "Autoload images"
+ checkable: true
+ checked: WebEngine.settings.autoLoadImages
+ onCheckedChanged: WebEngine.settings.autoLoadImages = checked
+ }
+ MenuItem {
+ id: javaScriptEnabled
+ text: "JavaScript On"
+ checkable: true
+ checked: WebEngine.settings.javascriptEnabled
+ onCheckedChanged: WebEngine.settings.javascriptEnabled = checked
+ }
+ }
+ }
}
ProgressBar {
id: progressBar