Porting to Qt5.6.0: additional changes.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dee2009f427c4e0a7e085e3c61763eafa0198649..4a9a15cdccbc7082459cabcf95acf96851a694fb 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,15 +154,18 @@ IF(NOT SALOME_BUILD_WITH_QT5)
   FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL QtNetwork)
   ADD_DEFINITIONS("-DUSE_SALOME_STYLE")
   SET(QT_SALOME_VERSION 4)
+  SET(SALOME_GUI_ENABLE_QTXWEBBROWSER TRUE)
 ELSE()
   FIND_PACKAGE(SalomeQt5 REQUIRED)
   SET(QT_SALOME_VERSION 5)
-  # Check that WebEngine component was found
-  IF(Qt5WebEngine_FOUND)
-    SET(SALOME_QT5HAVE_WEBENGINE TRUE)
-  ELSE()
-    MESSAGE("Qt5WebEngine is not found, SALOME internal help browser will be unavailable !")
-    ADD_DEFINITIONS("-DDISABLE_QTXWEBBROWSER")
+  SET(SALOME_GUI_ENABLE_QTXWEBBROWSER TRUE)
+  IF(NOT "${QT_VERSION}" VERSION_LESS "5.6.0")
+    # Check that WebEngine component was found
+    IF(NOT Qt5WebEngine_FOUND)
+      SET(SALOME_GUI_ENABLE_QTXWEBBROWSER FALSE)
+        ADD_DEFINITIONS("-DDISABLE_QTXWEBBROWSER")
+        MESSAGE("Qt5WebEngine is not found, SALOME internal help browser will be unavailable !")
+    ENDIF()
   ENDIF()
 ENDIF()
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b63a606a5608fbf94d1a3df355c72380898efc42..eb2dc764bb2f0bcb01e9018d64ec5f8f246451c5 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,7 +22,7 @@
 ##
 ADD_SUBDIRECTORY(CASCatch)
 ADD_SUBDIRECTORY(Qtx)
-IF(SALOME_BUILD_WITH_QT5 AND SALOME_QT5HAVE_WEBENGINE)
+IF(SALOME_GUI_ENABLE_QTXWEBBROWSER)
   ADD_SUBDIRECTORY(HelpBrowser)
 ENDIF()
 ADD_SUBDIRECTORY(Style)

diff --git a/src/Qtx/CMakeLists.txt b/src/Qtx/CMakeLists.txt
index 176385a6a894e991c351208fdcf5e6fff64acd4a..f25866f091e732b8a9b106879e7c66ae64c8f83f 100755 (executable)
--- a/src/Qtx/CMakeLists.txt
+++ b/src/Qtx/CMakeLists.txt
@@ -81,7 +81,7 @@ SET(_moc_HEADERS
   QtxWorkstackAction.h
 )
 
-IF(SALOME_BUILD_WITH_QT5 AND SALOME_QT5HAVE_WEBENGINE)
+IF(SALOME_GUI_ENABLE_QTXWEBBROWSER)
   SET(_moc_HEADERS ${_moc_HEADERS}  QtxWebBrowser.h)
 ENDIF()
 
@@ -174,7 +174,7 @@ SET(_other_SOURCES
   QtxWorkstackAction.cxx
 )
 
-IF(SALOME_BUILD_WITH_QT5 AND SALOME_QT5HAVE_WEBENGINE)
+IF(SALOME_GUI_ENABLE_QTXWEBBROWSER)
   SET(_other_SOURCES ${_other_SOURCES}  QtxWebBrowser.cxx)
 ENDIF()