From 17a936f45196b51b643a4a443857b5f88dd02d66 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 11 Sep 2017 22:37:40 +0200
Subject: Bump to Qt 5.9 and avoid focus stealing of the webview

---
 CMakeLists.txt                                    | 2 +-
 components/mailviewer/contents/ui/HtmlContent.qml | 7 +++----
 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)
 
 project(kube VERSION 0.5)
 
-set (QT_MIN_VERSION "5.7.0")
+set (QT_MIN_VERSION "5.9.0")
 
 cmake_policy(SET CMP0011 NEW)
 cmake_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 @@
 
 import QtQuick 2.4
 import QtQuick.Controls 1.3
-//TODO import QtWebEngine 1.4
-import QtWebEngine 1.3
+import QtWebEngine 1.4
 
 import org.kube.framework 1.0 as Kube
 
@@ -45,8 +44,6 @@ Item {
                 console.warn("Error is ", loadRequest.errorString)
             }
         }
-        //TODO The webview should not steal focus (depends on webengine 1.4)
-        //focusOnNavigationEnabled: false
         settings {
             webGLEnabled: false
             touchIconsEnabled: false
@@ -67,6 +64,8 @@ Item {
             autoLoadImages: true
             autoLoadIconsForPage: false
             accelerated2dCanvasEnabled: false
+            //The webview should not steal focus
+            focusOnNavigationEnabled: false
         }
         profile: Kube.WebEngineProfile
         //TODO Disable the context menu (depends on webengine 1.4)
-- 
cgit v1.2.3