From: uhz <ulysse.humbert-gonzalez@opencascade.com>
Date: Wed, 15 Nov 2017 16:26:48 +0000 (+0100)
Subject: Revert "WebKit and WebKitWidgets for Qt5 are mandatory"
X-Git-Tag: V9_0_0~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c2efa685a024f4d94867d02d1a9c19fbb2f1eb73;p=tools%2Fconfiguration.git

Revert "WebKit and WebKitWidgets for Qt5 are mandatory"

This reverts commit f3a20e2eda6d17133a07e99ab2d5a09e5be21ddb.
---

diff --git a/cmake/FindSalomeQt5.cmake b/cmake/FindSalomeQt5.cmake
index b13367e..3c6903f 100644
--- a/cmake/FindSalomeQt5.cmake
+++ b/cmake/FindSalomeQt5.cmake
@@ -42,10 +42,18 @@ IF(Qt5Core_FOUND)
 ENDIF()
 
 # Add mandatory Qt 5 components below
-SET(Qt5_FIND_COMPONENTS Gui Widgets Network Xml OpenGL PrintSupport Help Test WebKit WebKitWidgets)
+SET(Qt5_FIND_COMPONENTS Gui Widgets Network Xml OpenGL PrintSupport Help Test)
 # Add optional Qt 5 components below
 SET(Qt5_OPTIONAL_COMPONENTS)
 
+IF ("${QT_VERSION}" VERSION_LESS "5.6.0")
+  # QtWebKit package is used with Qt < 5.6
+  LIST(APPEND Qt5_FIND_COMPONENTS WebKit WebKitWidgets)
+ELSE()
+  # QtWebEngine package is (optionally) used with Qt >= 5.6
+  LIST(APPEND Qt5_OPTIONAL_COMPONENTS WebEngine WebEngineWidgets)
+ENDIF()
+
 IF(NOT WIN32)
   ## QtX11Extras package is used on Linux only
   LIST(APPEND Qt5_FIND_COMPONENTS X11Extras)