]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Remove QT4 compatibility: additional changes. rnv/remove_qt4compat
authorrnv <rnv@opencascade.com>
Fri, 31 May 2019 09:03:16 +0000 (12:03 +0300)
committerrnv <rnv@opencascade.com>
Fri, 31 May 2019 09:03:16 +0000 (12:03 +0300)
CMakeLists.txt

index 940ceeed016191ea302918abf8034d43e088b3ba..2ce9d649ea7aacd593521e55eb07a4c0fcd06540 100644 (file)
@@ -139,17 +139,10 @@ ENDIF(SALOME_BUILD_GUI)
 ##
 
 IF(SALOME_BUILD_GUI)
-  IF(NOT SALOME_GUI_BUILD_WITH_QT5)
-    # Qt
-    FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL QtNetwork)
-    # PyQt
-    FIND_PACKAGE(SalomePyQt4 REQUIRED)
-  ELSE()
-    # Qt
-    FIND_PACKAGE(SalomeQt5 REQUIRED)
-    # PyQt
-    FIND_PACKAGE(SalomePyQt5 REQUIRED)
-  ENDIF()
+  # Qt
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
+  # PyQt
+  FIND_PACKAGE(SalomePyQt5 REQUIRED)
 ENDIF(SALOME_BUILD_GUI)
 
 ##