Remove QT4 compatibility: additional changes.

Remove QT4 compatibility.
2019-05-31 12:17:24 +03:00 · 2019-05-30 15:07:23 +03:00
2 changed files with 2 additions and 9 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -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
--- a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
@ -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);
Author	SHA1	Message	Date
rnv	716aa3303d	Remove QT4 compatibility: additional changes.	2019-05-31 12:17:24 +03:00
rnv	9c0c482c0b	Remove QT4 compatibility.	2019-05-30 15:07:23 +03:00