]> SALOME platform Git repositories - modules/jobmanager.git/commitdiff
Salome HOME
Remove QT4 compatibility. V9_4_0a1 V9_4_0a2 V9_4_0b1
authorrnv <rnv@opencascade.com>
Thu, 30 May 2019 12:05:29 +0000 (15:05 +0300)
committerrnv <rnv@opencascade.com>
Fri, 31 May 2019 13:33:18 +0000 (16:33 +0300)
CMakeLists.txt
src/genericgui/BL_JobsTable.cxx

index dbe707644853cfbec55c855ea2649b90b0babc04..bcf5b487fc290d34ef1f076ecdc489676a4d49e9 100644 (file)
@@ -111,11 +111,7 @@ ELSE(EXISTS ${GUI_ROOT_DIR})
 ENDIF(EXISTS ${GUI_ROOT_DIR})
 
 # 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)
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()
index 50373254a98d75e79a17db8e96ba111663e1e98f..283d1820386f058c7303d248d095cd3f768217f2 100644 (file)
@@ -42,11 +42,7 @@ BL::JobsTable::JobsTable(QWidget *parent) : QTableView(parent)
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 
   QHeaderView * header_view = verticalHeader();
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-  header_view->setClickable(false);
-#else
   header_view->setSectionsClickable(false);
-#endif
 }
 
 BL::JobsTable::~JobsTable()