Salome HOME
Remove QT4 compatibility.
authorrnv <rnv@opencascade.com>
Thu, 30 May 2019 12:07:23 +0000 (15:07 +0300)
committerrnv <rnv@opencascade.com>
Fri, 31 May 2019 13:38:10 +0000 (16:38 +0300)
CMakeLists.txt
src/GUI/NETGENPluginGUI_HypothesisCreator.cxx

index 08aa8173a7c76222ec58461af7d1daa7861be99e..ed62da456b56b7f57abc04d9dc7caa2dced4f903 100644 (file)
@@ -117,11 +117,7 @@ ENDIF(SALOME_BUILD_GUI)
 
 IF(SALOME_BUILD_GUI)
   # Qt
-  IF(NOT SALOME_GUI_BUILD_WITH_QT5)
-    FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-  ELSE()
-    FIND_PACKAGE(SalomeQt5 REQUIRED)
-  ENDIF()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
 ENDIF(SALOME_BUILD_GUI)
 
 # OCCT
index 037948ae754e4d5b4771564d5d87b352e4931b30..cf7d76b608cbbec24e078bff98401d5266bd7881 100644 (file)
@@ -413,11 +413,8 @@ QFrame* NETGENPluginGUI_HypothesisCreator::buildFrame()
     localSizeHeaders << tr( "LSZ_ENTRY_COLUMN" )<< tr( "LSZ_NAME_COLUMN" ) << tr( "LSZ_LOCALSIZE_COLUMN" );
     myLocalSizeTable->setHorizontalHeaderLabels(localSizeHeaders);
     myLocalSizeTable->horizontalHeader()->hideSection(LSZ_ENTRY_COLUMN);
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    myLocalSizeTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
-#else
     myLocalSizeTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
-#endif
+
     myLocalSizeTable->resizeColumnToContents(LSZ_NAME_COLUMN);
     myLocalSizeTable->resizeColumnToContents(LSZ_LOCALSIZE_COLUMN);
     myLocalSizeTable->setAlternatingRowColors(true);