summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--components/mailviewer/contents/ui/HtmlContent.qml7
2 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa702ba7..9f52c825 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
2 2
3project(kube VERSION 0.5) 3project(kube VERSION 0.5)
4 4
5set (QT_MIN_VERSION "5.7.0") 5set (QT_MIN_VERSION "5.9.0")
6 6
7cmake_policy(SET CMP0011 NEW) 7cmake_policy(SET CMP0011 NEW)
8cmake_policy(SET CMP0028 NEW) 8cmake_policy(SET CMP0028 NEW)
diff --git a/components/mailviewer/contents/ui/HtmlContent.qml b/components/mailviewer/contents/ui/HtmlContent.qml
index 946bbe37..057fb096 100644
--- a/components/mailviewer/contents/ui/HtmlContent.qml
+++ b/components/mailviewer/contents/ui/HtmlContent.qml
@@ -18,8 +18,7 @@
18 18
19import QtQuick 2.4 19import QtQuick 2.4
20import QtQuick.Controls 1.3 20import QtQuick.Controls 1.3
21//TODO import QtWebEngine 1.4 21import QtWebEngine 1.4
22import QtWebEngine 1.3
23 22
24import org.kube.framework 1.0 as Kube 23import org.kube.framework 1.0 as Kube
25 24
@@ -45,8 +44,6 @@ Item {
45 console.warn("Error is ", loadRequest.errorString) 44 console.warn("Error is ", loadRequest.errorString)
46 } 45 }
47 } 46 }
48 //TODO The webview should not steal focus (depends on webengine 1.4)
49 //focusOnNavigationEnabled: false
50 settings { 47 settings {
51 webGLEnabled: false 48 webGLEnabled: false
52 touchIconsEnabled: false 49 touchIconsEnabled: false
@@ -67,6 +64,8 @@ Item {
67 autoLoadImages: true 64 autoLoadImages: true
68 autoLoadIconsForPage: false 65 autoLoadIconsForPage: false
69 accelerated2dCanvasEnabled: false 66 accelerated2dCanvasEnabled: false
67 //The webview should not steal focus
68 focusOnNavigationEnabled: false
70 } 69 }
71 profile: Kube.WebEngineProfile 70 profile: Kube.WebEngineProfile
72 //TODO Disable the context menu (depends on webengine 1.4) 71 //TODO Disable the context menu (depends on webengine 1.4)