Merge remote-tracking branch 'origin/1.0' into dev

Change-Id: Ibd678c267a3aa136b4c7c660c3b36ba8b8ce5325

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