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

index 95d1ef7e281d3731fc87536266c0f48930c1ea0c..147ce7f9df493958d17b857fc9e74916c8b5a669 100644 (file)
@@ -151,19 +151,11 @@ IF(SALOME_BUILD_GUI)
     ## Prerequisites From GUI:
     ##
     # Qt
-    IF(NOT SALOME_GUI_BUILD_WITH_QT5)
-      FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
-    ELSE()
-      FIND_PACKAGE(SalomeQt5 REQUIRED)
-    ENDIF()
+    FIND_PACKAGE(SalomeQt5 REQUIRED)
     # SIP
     FIND_PACKAGE(SalomeSIP REQUIRED)  # should come after Python and before PyQt5
     # PyQt
-    IF (NOT SALOME_GUI_BUILD_WITH_QT5)
-      FIND_PACKAGE(SalomePyQt4 REQUIRED)
-    ELSE()
-      FIND_PACKAGE(SalomePyQt5 REQUIRED)
-    ENDIF()
+    FIND_PACKAGE(SalomePyQt5 REQUIRED)
     # Qwt
     FIND_PACKAGE(SalomeQwt REQUIRED)
   ELSE(EXISTS ${GUI_ROOT_DIR})