From aaae770f7add43ecd2f421672ff1634ae8e7c532 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Fri, 6 Mar 2015 19:47:17 +0100
Subject: [PATCH] Remove WebKit.

---
 CMakeLists.txt              |  2 +-
 alethzero/CMakeLists.txt    |  2 --
 alethzero/Main.ui           | 14 +-------------
 cmake/EthDependencies.cmake |  4 ++--
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93d0e16dc..e65f0b398 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,7 +212,7 @@ if (NOT JUSTTESTS)
 
 		if (ETH_HAVE_WEBENGINE)
 			add_subdirectory(alethzero)
-			add_subdirectory(third)
+#			add_subdirectory(third)	// reenable once not qtwebkit.
 		endif()
 
 		add_subdirectory(mix)
diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt
index bbd1aee22..cbc9e087a 100644
--- a/alethzero/CMakeLists.txt
+++ b/alethzero/CMakeLists.txt
@@ -41,8 +41,6 @@ add_dependencies(${EXECUTABLE} BuildInfo.h)
 
 target_link_libraries(${EXECUTABLE} Qt5::Core)
 target_link_libraries(${EXECUTABLE} Qt5::Widgets)
-target_link_libraries(${EXECUTABLE} Qt5::WebKit)
-target_link_libraries(${EXECUTABLE} Qt5::WebKitWidgets)
 target_link_libraries(${EXECUTABLE} Qt5::WebEngine)
 target_link_libraries(${EXECUTABLE} Qt5::WebEngineWidgets)
 target_link_libraries(${EXECUTABLE} webthree)
diff --git a/alethzero/Main.ui b/alethzero/Main.ui
index 46fa8db91..da5ee6c4a 100644
--- a/alethzero/Main.ui
+++ b/alethzero/Main.ui
@@ -807,13 +807,7 @@
       <number>0</number>
      </property>
      <item>
-      <widget class="QWebView" name="jsConsole">
-       <property name="url">
-        <url>
-         <string>about:blank</string>
-        </url>
-       </property>
-      </widget>
+      <widget class="QWebEngineView" name="jsConsole" native="true"/>
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_9">
@@ -1668,11 +1662,6 @@ font-size: 14pt</string>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header>QtWebKitWidgets/QWebView</header>
-  </customwidget>
   <customwidget>
    <class>MiningView</class>
    <extends>QWidget</extends>
@@ -1702,7 +1691,6 @@ font-size: 14pt</string>
   <tabstop>log</tabstop>
   <tabstop>post</tabstop>
   <tabstop>verbosity</tabstop>
-  <tabstop>jsConsole</tabstop>
   <tabstop>tabWidget</tabstop>
   <tabstop>urlEdit</tabstop>
   <tabstop>idealPeers</tabstop>
diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake
index 3f6cbcd77..645942998 100644
--- a/cmake/EthDependencies.cmake
+++ b/cmake/EthDependencies.cmake
@@ -120,8 +120,8 @@ if (NOT HEADLESS)
 	find_package (Qt5Qml REQUIRED)
 	find_package (Qt5Network REQUIRED)
 	find_package (Qt5Widgets REQUIRED)
-	find_package (Qt5WebKit REQUIRED)
-	find_package (Qt5WebKitWidgets REQUIRED)
+	find_package (Qt5WebEngine REQUIRED)
+	find_package (Qt5WebEngineWidgets REQUIRED)
 
 	# we need to find path to macdeployqt on mac
 	if (APPLE)