From deddc4b3e22479bfad1ba9f3983c60f5b5f72639 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 13 Dec 2016 19:48:22 +0100
Subject: [PATCH] use Qt WebKit module

---
 CMakeLists.txt                          | 5 ++++-
 src/Mod/Web/CMakeLists.txt              | 2 +-
 src/Mod/Web/Gui/CMakeLists.txt          | 4 ++--
 src/Tools/_TEMPLATE_/Gui/CMakeLists.txt | 7 +++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ddeecbb5..8f37551af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -722,7 +722,10 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
             find_package(Qt5UiTools)
             find_package(Qt5Network)
             find_package(Qt5Concurrent)
-            #find_package(Qt5WebEngine)
+            if (NOT WIN32)
+            # Disable for Windows for now since building the Qt sources always fails
+            find_package(Qt5WebKitWidgets)
+            endif()
         endif(BUILD_GUI)
 
         IF(NOT Qt5Core_FOUND)
diff --git a/src/Mod/Web/CMakeLists.txt b/src/Mod/Web/CMakeLists.txt
index bef7ecc08..e0c11d989 100644
--- a/src/Mod/Web/CMakeLists.txt
+++ b/src/Mod/Web/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 add_subdirectory(App)
 if(BUILD_GUI)
-    if(Qt5WebEngine_FOUND OR QT_QTWEBKIT_FOUND)
+    if(Qt5WebKitWidgets_FOUND OR QT_QTWEBKIT_FOUND)
         add_subdirectory(Gui)
     endif()
 endif(BUILD_GUI)
diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt
index b298e2665..75c6f2398 100644
--- a/src/Mod/Web/Gui/CMakeLists.txt
+++ b/src/Mod/Web/Gui/CMakeLists.txt
@@ -13,10 +13,10 @@ set(WebGui_LIBS
 
 if(BUILD_QT5)
     include_directories(
-        ${Qt5WebEngine_INCLUDE_DIRS}
+        ${Qt5WebKitWidgets_INCLUDE_DIRS}
     )
     list(APPEND WebGui_LIBS
-        ${Qt5WebEngine_LIBRARIES}
+        ${Qt5WebKitWidgets_LIBRARIES}
     )
     qt5_add_resources(Web_QRC_SRCS Resources/Web.qrc)
 else()
diff --git a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
index 5154e7e5e..39ec8a93d 100644
--- a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
     ${COIN3D_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}
     ${XercesC_INCLUDE_DIRS}
@@ -15,7 +14,11 @@ set(_TEMPLATE_Gui_LIBS
     FreeCADGui
 )
 
-qt4_add_resources(_TEMPLATE__QRC_SRCS Resources/_TEMPLATE_.qrc)
+if (BUILD_QT5)
+    qt5_add_resources(_TEMPLATE__QRC_SRCS Resources/_TEMPLATE_.qrc)
+else()
+    qt4_add_resources(_TEMPLATE__QRC_SRCS Resources/_TEMPLATE_.qrc)
+endif()
 
 SET(_TEMPLATE_Gui_SRCS
     ${_TEMPLATE__QRC_SRCS}