WebKit and WebKitWidgets for Qt5 are mandatory

If put in optional list, the Qt5WebKit_DIR and Qt5WebKitWidgets_DIR
variables are not exported.

diff --git a/cmake/FindSalomeQt5.cmake b/cmake/FindSalomeQt5.cmake
index 3c6903f53723b31f973c92f330112fa111f2a530..b13367ef6233406cd4154e45d8007e90de19f264 100644 (file)
--- a/cmake/FindSalomeQt5.cmake
+++ b/cmake/FindSalomeQt5.cmake
@@ -42,18 +42,10 @@ IF(Qt5Core_FOUND)
 ENDIF()
 
 # Add mandatory Qt 5 components below
-SET(Qt5_FIND_COMPONENTS Gui Widgets Network Xml OpenGL PrintSupport Help Test)
+SET(Qt5_FIND_COMPONENTS Gui Widgets Network Xml OpenGL PrintSupport Help Test WebKit WebKitWidgets)
 # 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)