Merge remote branch 'origin/V7_dev' into V8_0_0_BR

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dc80fd57ff7f2aac716ca5e32c1f20c6d11bdc1..477914642a047acdf1ca70d9b20a3424677b326b 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,12 +29,12 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 
 # Find KERNEL
 # ===========
@@ -124,10 +124,17 @@ ENDIF(SALOME_BUILD_GUI)
 ##
 
 IF(SALOME_BUILD_GUI)
-
-  # Qt4
-  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
-  FIND_PACKAGE(SalomePyQt4)
+  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()
 ENDIF(SALOME_BUILD_GUI)
 
 ##

diff --git a/SalomeGEOMConfig.cmake.in b/SalomeGEOMConfig.cmake.in
index fe0e4b8f55687129720f7d41e6003aa4647c4d9a..42db6d36b81272b12252c6ee3f95aff42ddd8624 100644 (file)
--- a/SalomeGEOMConfig.cmake.in
+++ b/SalomeGEOMConfig.cmake.in
@@ -69,32 +69,34 @@ IF(SALOME_GEOM_USE_OPENCV)
   LIST(APPEND GEOM_DEFINITIONS "-DWITH_OPENCV")
 ENDIF()
 
-# For all prerequisites, load the corresponding targets if the package was used 
+# For all prerequisites, load the corresponding targets if the package was used
 # in CONFIG mode. This ensures dependent projects link correctly
 # without having to set LD_LIBRARY_PATH:
-SET(_PREREQ @_PREREQ_LIST@)
-SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
-SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-IF(NOT _list_len EQUAL 0)
+SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
+LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
+IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
   # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-  MATH(EXPR _range "${_list_len}-1")
-  FOREACH(_p RANGE ${_range})  
-    LIST(GET _PREREQ            ${_p} _pkg    )
-    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
-    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-    IF(NOT _pkg_compo)
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
-          PATHS "${_pkg_dir}" 
-          NO_DEFAULT_PATH)
-    ELSE()
-      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
-      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
-          COMPONENTS ${_compo_lst} 
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
+  MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
+  FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
+    LIST(GET _PREREQ_@PROJECT_NAME@            ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@    )
+    LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
+    LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
+      MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
+      IF(NOT _pkg_compo_@PROJECT_NAME@)
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ELSE()
+        STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
+        MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            COMPONENTS ${_compo_lst_@PROJECT_NAME@}
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDIF()

diff --git a/src/AdvancedGUI/CMakeLists.txt b/src/AdvancedGUI/CMakeLists.txt
index b2df1cc476a946d7a1094a297e7744a5a996354f..6a023ac702f2f7a6a0f00eee3ffe69a93e724271 100755 (executable)
--- a/src/AdvancedGUI/CMakeLists.txt
+++ b/src/AdvancedGUI/CMakeLists.txt
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -96,12 +94,12 @@ SET(_moc_HEADERS
   )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(AdvancedGUI_SOURCES
   AdvancedGUI.cxx
@@ -120,4 +118,4 @@ ADD_LIBRARY(AdvancedGUI ${AdvancedGUI_SOURCES})
 TARGET_LINK_LIBRARIES(AdvancedGUI ${_link_LIBRARIES})
 INSTALL(TARGETS AdvancedGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-QT4_INSTALL_TS_RESOURCES("${AdvancedGUI_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${AdvancedGUI_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")

diff --git a/src/BREPPlugin/CMakeLists.txt b/src/BREPPlugin/CMakeLists.txt
index 0372c1e6402b5a998f5515f5aa5f5c8ea0fcb740..7db89bde38f06f1d0814eef8a2bdae8922eb5bfb 100644 (file)
--- a/src/BREPPlugin/CMakeLists.txt
+++ b/src/BREPPlugin/CMakeLists.txt
@@ -18,8 +18,7 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQtExt)
 ENDIF()
 
 # --- options ---
@@ -39,7 +38,6 @@ INCLUDE_DIRECTORIES(
   
 IF(SALOME_BUILD_GUI)
   INCLUDE_DIRECTORIES(
-    ${QT_INCLUDE_DIRS}
     ${GUI_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/src/OBJECT
     ${PROJECT_SOURCE_DIR}/src/GEOMGUI
@@ -109,7 +107,7 @@ ENDIF()
 
 IF(SALOME_BUILD_GUI)
   # sources / moc wrappings
-  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
   SET(BREPPluginGUI_SOURCES
     BREPPlugin_GUI.cxx
@@ -145,7 +143,7 @@ IF(SALOME_BUILD_GUI)
   TARGET_LINK_LIBRARIES(BREPPluginGUI ${_link_gui_LIBRARIES})
   INSTALL(TARGETS BREPPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   
-  QT4_INSTALL_TS_RESOURCES("${BREPPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+  QT_INSTALL_TS_RESOURCES("${BREPPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
 ENDIF()
 
 

diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx
index 96a989a88d832be38154cfe41fa39e5ae8642db8..021592e5130d48bf467dff70a07139acf8d0fc09 100644 (file)
--- a/src/BasicGUI/BasicGUI_PointDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PointDlg.cxx
@@ -995,13 +995,13 @@ void BasicGUI_PointDlg::updateParamCoord(bool theIsUpdate)
     }
   }
   else if (id == GEOM_POINT_SURF) {
-    GroupOnSurface->TextLabel2->setShown(isParam);
-    GroupOnSurface->TextLabel3->setShown(isParam);
-    GroupOnSurface->SpinBox_DX->setShown(isParam);
-    GroupOnSurface->SpinBox_DY->setShown(isParam);
+    GroupOnSurface->TextLabel2->setVisible(isParam);
+    GroupOnSurface->TextLabel3->setVisible(isParam);
+    GroupOnSurface->SpinBox_DX->setVisible(isParam);
+    GroupOnSurface->SpinBox_DY->setVisible(isParam);
   }
 
-  GroupXYZ->setShown(!isParam && !isLength);
+  GroupXYZ->setVisible(!isParam && !isLength);
 
   if (theIsUpdate)
     QTimer::singleShot(50, this, SLOT(updateSize()));

diff --git a/src/BasicGUI/CMakeLists.txt b/src/BasicGUI/CMakeLists.txt
index 3a4821820ca4414fcc4e20b596869f47408c8e90..769c8092c7d6087b5fae60d532d8668dfb9c84f6 100755 (executable)
--- a/src/BasicGUI/CMakeLists.txt
+++ b/src/BasicGUI/CMakeLists.txt
@@ -17,13 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -94,7 +93,7 @@ SET(_moc_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(BasicGUI_SOURCES
   BasicGUI.cxx

diff --git a/src/BlocksGUI/CMakeLists.txt b/src/BlocksGUI/CMakeLists.txt
index ebc68572c05c7eab8ecceba39030c5504c98584b..a365598d36c6f2b297b231c8bd62d1591006f9c7 100755 (executable)
--- a/src/BlocksGUI/CMakeLists.txt
+++ b/src/BlocksGUI/CMakeLists.txt
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -83,12 +81,12 @@ SET(_moc_HEADERS
   )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(BlocksGUI_SOURCES
   BlocksGUI.cxx

diff --git a/src/BooleanGUI/CMakeLists.txt b/src/BooleanGUI/CMakeLists.txt
index e7c9b7850cf6d7744ac87e50485de6871c1662aa..f9f27055b16bb140cd54dff57eeddf0670615b82 100755 (executable)
--- a/src/BooleanGUI/CMakeLists.txt
+++ b/src/BooleanGUI/CMakeLists.txt
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -75,12 +73,12 @@ SET(_moc_HEADERS
   )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(BooleanGUI_SOURCES
   BooleanGUI.cxx

diff --git a/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx
index d474817f11a5f134135e12703b5d029d6360bbd0..afb657109e05fa2f28c0cd31ddfbf53d43778b4e 100644 (file)
--- a/src/BuildGUI/BuildGUI_FaceDlg.cxx
+++ b/src/BuildGUI/BuildGUI_FaceDlg.cxx
@@ -156,8 +156,13 @@ BuildGUI_FaceDlg::BuildGUI_FaceDlg( GeometryGUI* theGeometryGUI, QWidget* parent
   columnNames.append( tr( "GEOM_EDGE" ));
   columnNames.append( tr( "GEOM_FACE_CONSTRAINT" ) );
   myTreeConstraints->setHeaderLabels( columnNames );
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   myTreeConstraints->header()->setMovable( false );
   myTreeConstraints->header()->setResizeMode( QHeaderView::ResizeToContents );
+#else
+  myTreeConstraints->header()->setSectionsMovable( false );
+  myTreeConstraints->header()->setSectionResizeMode( QHeaderView::ResizeToContents );
+#endif
   myTreeConstraints->setMinimumHeight( 140 );
 
   QHBoxLayout* l = new QHBoxLayout( myGroupWireConstraints->Box );

diff --git a/src/BuildGUI/CMakeLists.txt b/src/BuildGUI/CMakeLists.txt
index 37bcff647a4f08fbe34608cc1543a81d70f72736..d3b92ad5247a42a936ff3e7ab33c416e979cbd95 100755 (executable)
--- a/src/BuildGUI/CMakeLists.txt
+++ b/src/BuildGUI/CMakeLists.txt
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -90,12 +88,12 @@ SET(_moc_HEADERS
   )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(BuildGUI_SOURCES
   BuildGUI.cxx

diff --git a/src/CurveCreator/CMakeLists.txt b/src/CurveCreator/CMakeLists.txt
index c085fc69f014213067c4a1ded8b8bf7becee394d..89b7bcd270a8c9da5cc0fdb74c102fc79b37f077 100644 (file)
--- a/src/CurveCreator/CMakeLists.txt
+++ b/src/CurveCreator/CMakeLists.txt
@@ -18,14 +18,13 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQtExt)
 ENDIF(SALOME_BUILD_GUI)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
@@ -85,7 +84,7 @@ SET(CurveCreator_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
 
 IF(SALOME_BUILD_GUI)
   # sources / moc wrappings
-  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 ENDIF(SALOME_BUILD_GUI)
 
 # sources / static
@@ -117,4 +116,3 @@ TARGET_LINK_LIBRARIES(CurveCreator ${_link_LIBRARIES})
 INSTALL(TARGETS CurveCreator EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${CurveCreator_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-

diff --git a/src/CurveCreator/CurveCreator_TreeView.cxx b/src/CurveCreator/CurveCreator_TreeView.cxx
index bb0f8545b0423a571976e083879b427cfe1105a4..148fabaab4d32a1fb220a881cbeb7511b90ac79d 100644 (file)
--- a/src/CurveCreator/CurveCreator_TreeView.cxx
+++ b/src/CurveCreator/CurveCreator_TreeView.cxx
@@ -213,7 +213,9 @@ int CurveCreator_TreeViewModel::getPoint( const QModelIndex& theIndx ) const
 void CurveCreator_TreeViewModel::setCurve( CurveCreator_ICurve* theCurve )
 {
   myCurve = theCurve;
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   reset();
+#endif
 }
 
 /*****************************************************************************************/
@@ -221,7 +223,11 @@ CurveCreator_TreeView::CurveCreator_TreeView( CurveCreator_ICurve* theCurve, QWi
   QTreeView(parent)
 {
   header()->hide();
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   header()->setResizeMode(QHeaderView::ResizeToContents);
+#else
+  header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#endif
   setUniformRowHeights(true);
   setContextMenuPolicy( Qt::CustomContextMenu );
   CurveCreator_TreeViewModel* aModel = new CurveCreator_TreeViewModel(theCurve, this);

diff --git a/src/DependencyTree/CMakeLists.txt b/src/DependencyTree/CMakeLists.txt
index 0aa01462a13db0b3c5d493e89b5dbb469717b75d..31ec9a39a7b034e0f096044110ed7db765a3e5e5 100644 (file)
--- a/src/DependencyTree/CMakeLists.txt
+++ b/src/DependencyTree/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 
@@ -73,7 +73,7 @@ SET(_moc_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(DependencyTree_SOURCES
   DependencyTree_Arrow.cxx
@@ -101,4 +101,4 @@ INSTALL(TARGETS DependencyTree EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${S
 
 INSTALL(FILES ${DependencyTree_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
-QT4_INSTALL_TS_RESOURCES("${_res_files}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_res_files}" "${SALOME_GEOM_INSTALL_RES_DATA}")

diff --git a/src/DependencyTree/DependencyTree_Arrow.cxx b/src/DependencyTree/DependencyTree_Arrow.cxx
index d7e38c5f65ef983ffeb9c86b551c505ea16715b1..b558f334744ffd42200f17ab43a78953896b0b93 100644 (file)
--- a/src/DependencyTree/DependencyTree_Arrow.cxx
+++ b/src/DependencyTree/DependencyTree_Arrow.cxx
@@ -39,7 +39,11 @@ const qreal arrowSize = 20;
 DependencyTree_Arrow::DependencyTree_Arrow( DependencyTree_Object* theStartItem,
                                             DependencyTree_Object* theEndItem,
                                             QGraphicsItem* parent, QGraphicsScene* scene )
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 :QGraphicsLineItem( parent, scene ),
+#else
+:QGraphicsLineItem( parent ),
+#endif
 myIsBiLink( false ),
 myStartItem( theStartItem ),
 myEndItem( theEndItem )

diff --git a/src/DisplayGUI/CMakeLists.txt b/src/DisplayGUI/CMakeLists.txt
index 7a9d92208017d765c1f2d3ccccfb0717100b5779..980c5097a528ab8db1518fb5bc48eee348b31ee7 100755 (executable)
--- a/src/DisplayGUI/CMakeLists.txt
+++ b/src/DisplayGUI/CMakeLists.txt
@@ -17,14 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
-
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}

diff --git a/src/DlgRef/CMakeLists.txt b/src/DlgRef/CMakeLists.txt
index ac45eab233871365dab0e5d82e8f2bc58e13f3d9..6fa1dac2424ed4b21e7e37894f88843b36961ef6 100755 (executable)
--- a/src/DlgRef/CMakeLists.txt
+++ b/src/DlgRef/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 
@@ -109,12 +109,12 @@ SET(_uic_files
 SET(_moc_HEADERS DlgRef.h)
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / to compile
 SET(DlgRef_SOURCES DlgRef.cxx ${_moc_SOURCES} ${_uic_HEADERS})

diff --git a/src/EntityGUI/CMakeLists.txt b/src/EntityGUI/CMakeLists.txt
index 0bb93f921c92435cfd152cf93f47709b534d103f..15778cb7c4bf8fa6c168f56dbe4533f56c497429 100755 (executable)
--- a/src/EntityGUI/CMakeLists.txt
+++ b/src/EntityGUI/CMakeLists.txt
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -131,12 +129,12 @@ SET(_moc_HEADERS
   )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(EntityGUI_SOURCES
   EntityGUI.cxx

diff --git a/src/EntityGUI/EntityGUI_FieldDlg.cxx b/src/EntityGUI/EntityGUI_FieldDlg.cxx
index 6e887f941eca2fbbf3a3d11d8de88ea8fb4ca584..aab2def9b6568c4112ec9d740d3317d6320e3027 100644 (file)
--- a/src/EntityGUI/EntityGUI_FieldDlg.cxx
+++ b/src/EntityGUI/EntityGUI_FieldDlg.cxx
@@ -1695,7 +1695,7 @@ void EntityGUI_FieldDlg::activateSelection()
         TopoDS_Shape aSubShape = myShapeMap( index );
         QString anEntry = QString( "TEMP_" ) + aMainEntry.in() + QString("_%1").arg(index);
         Handle(SALOME_InteractiveObject) io =
-          new SALOME_InteractiveObject(anEntry.toAscii(), "GEOM", "TEMP_IO");
+          new SALOME_InteractiveObject(anEntry.toLatin1(), "GEOM", "TEMP_IO");
         aDisplayer->SetColor( aCol );
         SALOME_Prs* aPrs = aDisplayer->buildSubshapePresentation(aSubShape, anEntry, aView);
         if (aPrs) {

diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
index 6b0248b08c2c9986ec43ec78cd3f5f11890ecb83..6749738fdec2ec85ebfbfd9ab742db57ca5a3be2 100644 (file)
--- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
@@ -1143,7 +1143,7 @@ void EntityGUI_SketcherDlg::ClickOnEnd()
     }
 
     QString Command = myCommand.join( "" );
-    Sketcher_Profile aProfile = Sketcher_Profile( Command.toAscii() );
+    Sketcher_Profile aProfile = Sketcher_Profile( Command.toLatin1() );
     bool isDone = false;
     TopoDS_Shape myShape = aProfile.GetShape( &isDone );
     if ( isDone ) {
@@ -2341,12 +2341,12 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
 
     //Last Shape
     QString Command1 = myCommand.join( "" );
-    Sketcher_Profile aProfile1( Command1.toAscii() );
+    Sketcher_Profile aProfile1( Command1.toLatin1() );
     myShape1 = aProfile1.GetShape();
 
     //Current Shape
     QString Command2 = Command1 + GetNewCommand( aParameters );
-    Sketcher_Profile aProfile2( Command2.toAscii() );
+    Sketcher_Profile aProfile2( Command2.toLatin1() );
     myShape2 = aProfile2.GetShape( &isDone, &error );
 
     //Error Message

diff --git a/src/GEOMBase/CMakeLists.txt b/src/GEOMBase/CMakeLists.txt
index f3cc03f2680687e6f43bce97e4d87b7998674515..a6b58e6a51931c3ab74915ce635a0b4b92186961 100755 (executable)
--- a/src/GEOMBase/CMakeLists.txt
+++ b/src/GEOMBase/CMakeLists.txt
@@ -17,13 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
-
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -80,7 +77,7 @@ SET(_moc_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(GEOMBase_SOURCES
   GEOMBase.cxx

diff --git a/src/GEOMFiltersSelection/CMakeLists.txt b/src/GEOMFiltersSelection/CMakeLists.txt
index d999542d4eba5eed00358da24ec3ebdd106b2e52..89669a29b97185dcc6602d89b605cc4af792b168 100755 (executable)
--- a/src/GEOMFiltersSelection/CMakeLists.txt
+++ b/src/GEOMFiltersSelection/CMakeLists.txt
@@ -17,13 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
-
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${PTHREAD_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

diff --git a/src/GEOMGUI/CMakeLists.txt b/src/GEOMGUI/CMakeLists.txt
index c5e9e928f19b0d34ec243cdea90f3e10542158c0..d6e2f5d6f5770404642655ecd1eb11479b85be19 100755 (executable)
--- a/src/GEOMGUI/CMakeLists.txt
+++ b/src/GEOMGUI/CMakeLists.txt
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -103,10 +101,10 @@ SET(_ts_RESOURCES
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / rcc wrappings
-QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
+QT_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
 
 SET(GEOMGUI_SOURCES
   GeometryGUI.cxx
@@ -129,4 +127,4 @@ TARGET_LINK_LIBRARIES(GEOM ${_link_LIBRARIES})
 INSTALL(TARGETS GEOM EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${GEOMGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")

diff --git a/src/GEOMGUI/GEOMGUI.cxx b/src/GEOMGUI/GEOMGUI.cxx
index f743932508e5a96c1d9735520764b7d7e4041771..05dabb9fe66b30786516fa9c18a908dd33d993e4 100644 (file)
--- a/src/GEOMGUI/GEOMGUI.cxx
+++ b/src/GEOMGUI/GEOMGUI.cxx
@@ -54,7 +54,7 @@ GEOMGUI::~GEOMGUI()
 //=================================================================================
 bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/, const QVariant& /*theParam*/  )
 {
-  return TRUE;
+  return true;
 }
 
 //=================================================================================
@@ -63,7 +63,7 @@ bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/, const
 //=================================================================================
 bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/ )
 {
-  return TRUE;
+  return true;
 }
 
 //=================================================================================
@@ -73,7 +73,7 @@ bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/ )
 //=================================================================================
 bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
-  return FALSE;
+  return false;
 }
 
 //=================================================================================
@@ -82,7 +82,7 @@ bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_
 //=================================================================================
 bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
-  return TRUE;
+  return true;
 }
 
 //=================================================================================
@@ -91,7 +91,7 @@ bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_V
 //=================================================================================
 bool GEOMGUI::OnMouseRelease( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
-  return TRUE;
+  return true;
 }
 
 //=================================================================================
@@ -100,7 +100,7 @@ bool GEOMGUI::OnMouseRelease( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUI
 //=================================================================================
 bool GEOMGUI::OnKeyPress( QKeyEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
-  return TRUE;
+  return true;
 }
 
 //=================================================================================

diff --git a/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx b/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx
index 35a59ccfb6c2ab2022e1589a4577e9b64d7739d4..5ab93cee006841115a3ecba847ef9649d8d10c75 100644 (file)
--- a/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx
+++ b/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx
@@ -47,7 +47,11 @@ GEOMGUI_CreationInfoWdg::GEOMGUI_CreationInfoWdg( SalomeApp_Application* app )
   myParamsTreeWd->setColumnCount( 2 );
   myParamsTreeWd->setHeaderLabels( QStringList() << tr( "PARAMETER" ) << tr( "VALUE" ) );
   myParamsTreeWd->header()->setStretchLastSection( true );
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   myParamsTreeWd->header()->setResizeMode( 0, QHeaderView::ResizeToContents );
+#else
+  myParamsTreeWd->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents );
+#endif
 
   QVBoxLayout* aLayout = new QVBoxLayout( this );
   aLayout->addWidget( myParamsTreeWd );

diff --git a/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx b/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx
index 2c00a3bd4d17ae007fafafcf6703bdbe003a3fa1..47ab21c609a1f8945ea49745370493469761a572 100644 (file)
--- a/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx
+++ b/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx
@@ -73,8 +73,11 @@ GEOMGUI_TextTreeWdg::GEOMGUI_TextTreeWdg( SalomeApp_Application* app )
   headerItem->setIcon( 1, myVisibleIcon );
   setHeaderItem ( headerItem ); 
   header()->moveSection( 1, 0 );
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   header()->setResizeMode( 1, QHeaderView::ResizeToContents );
-
+#else
+  header()->setSectionResizeMode( 1, QHeaderView::ResizeToContents );
+#endif
   QStringList rootNames;
   rootNames << tr("GEOM_DIMENSIONS") << "";
   myDimensionsItem = new QTreeWidgetItem( this, rootNames );

diff --git a/src/GEOMToolsGUI/CMakeLists.txt b/src/GEOMToolsGUI/CMakeLists.txt
index cb3e004cb7117deb010018b833fb92fb5150c4c2..96380bee200dd35a559061624d99094405f7a2f5 100755 (executable)
--- a/src/GEOMToolsGUI/CMakeLists.txt
+++ b/src/GEOMToolsGUI/CMakeLists.txt
@@ -17,13 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
-
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -98,7 +95,7 @@ SET(_moc_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(GEOMToolsGUI_SOURCES
   GEOMToolsGUI.cxx

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
index f977e08d92da60bef029ab573c05fabab0da8213..1d8bc588b7addaeee135cc631c2ff8e3a2c58282 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
@@ -52,7 +52,7 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
   setModal(true);
 
   setWindowTitle(tr("GEOM_DEFLECTION_TLT"));
-  setSizeGripEnabled(TRUE);
+  setSizeGripEnabled(true);
   QGridLayout* MyDialogLayout = new QGridLayout(this);
   MyDialogLayout->setSpacing(6);
   MyDialogLayout->setMargin(11);
@@ -101,8 +101,8 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
   QPushButton* buttonOk = new QPushButton (GroupButtons);
   buttonOk->setObjectName("buttonOk");
   buttonOk->setText(tr("GEOM_BUT_OK"));
-  buttonOk->setAutoDefault(TRUE);
-  buttonOk->setDefault(TRUE);
+  buttonOk->setAutoDefault(true);
+  buttonOk->setDefault(true);
   GroupButtonsLayout->addWidget(buttonOk, 0, 0);
 
   GroupButtonsLayout->addItem(new QSpacerItem (20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1);
@@ -110,13 +110,13 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
   QPushButton* buttonCancel = new QPushButton (GroupButtons);
   buttonCancel->setObjectName("buttonCancel");
   buttonCancel->setText(tr("GEOM_BUT_CANCEL"));
-  buttonCancel->setAutoDefault(TRUE);
+  buttonCancel->setAutoDefault(true);
   GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
 
   QPushButton* buttonHelp = new QPushButton (GroupButtons);
   buttonHelp->setObjectName("buttonHelp");
   buttonHelp->setText(tr("GEOM_BUT_HELP"));
-  buttonHelp->setAutoDefault(TRUE);
+  buttonHelp->setAutoDefault(true);
   GroupButtonsLayout->addWidget(buttonHelp, 0, 2);
   /***************************************************************/
 

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
index 95713739cdd944e1c35502b35323aa480ebc9d32..bfadece29630050034f0a1936ef73c347ca081aa 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
@@ -54,7 +54,7 @@ GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QSt
   setModal(true);
 
   setWindowTitle(tr(title.toLatin1().constData()));
-  setSizeGripEnabled(TRUE);
+  setSizeGripEnabled(true);
   QGridLayout* MyDialogLayout = new QGridLayout(this);
   MyDialogLayout->setSpacing(6);
   MyDialogLayout->setMargin(11);
@@ -95,8 +95,8 @@ GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QSt
   QPushButton* buttonOk = new QPushButton (GroupButtons);
   buttonOk->setObjectName("buttonOk");
   buttonOk->setText(tr("GEOM_BUT_OK"));
-  buttonOk->setAutoDefault(TRUE);
-  buttonOk->setDefault(TRUE);
+  buttonOk->setAutoDefault(true);
+  buttonOk->setDefault(true);
   GroupButtonsLayout->addWidget(buttonOk, 0, 0);
 
   GroupButtonsLayout->addItem(new QSpacerItem (20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1);
@@ -104,13 +104,13 @@ GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QSt
   QPushButton* buttonCancel = new QPushButton (GroupButtons);
   buttonCancel->setObjectName("buttonCancel");
   buttonCancel->setText(tr("GEOM_BUT_CANCEL"));
-  buttonCancel->setAutoDefault(TRUE);
+  buttonCancel->setAutoDefault(true);
   GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
 
   QPushButton* buttonHelp = new QPushButton (GroupButtons);
   buttonHelp->setObjectName("buttonHelp");
   buttonHelp->setText(tr("GEOM_BUT_HELP"));
-  buttonHelp->setAutoDefault(TRUE);
+  buttonHelp->setAutoDefault(true);
   GroupButtonsLayout->addWidget(buttonHelp, 0, 2);
   /***************************************************************/
 

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
index ab1ea6692e4399a7afcc2405b0d9468f077e15fe..724346eb831819f12cb3fc242490bd3df132c329 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
@@ -53,7 +53,7 @@ GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
   setModal( true );
 
   setWindowTitle( tr( "GEOM_MEN_ISOS" ) );
-  setSizeGripEnabled(TRUE);
+  setSizeGripEnabled(true);
   QGridLayout* MyDialogLayout = new QGridLayout(this); 
   MyDialogLayout->setSpacing(6);
   MyDialogLayout->setMargin(11);
@@ -101,8 +101,8 @@ GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
   QPushButton* buttonOk = new QPushButton( GroupButtons );
   buttonOk->setObjectName( "buttonOk" );
   buttonOk->setText( tr( "GEOM_BUT_OK" ) ) ;
-  buttonOk->setAutoDefault( TRUE );
-  buttonOk->setDefault( TRUE );
+  buttonOk->setAutoDefault( true );
+  buttonOk->setDefault( true );
   GroupButtonsLayout->addWidget( buttonOk, 0, 0 );
   
   GroupButtonsLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
@@ -110,13 +110,13 @@ GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
   QPushButton* buttonCancel = new QPushButton( GroupButtons );
   buttonCancel->setObjectName( "buttonCancel" );
   buttonCancel->setText( tr( "GEOM_BUT_CANCEL" ) ) ;
-  buttonCancel->setAutoDefault( TRUE );
+  buttonCancel->setAutoDefault( true );
   GroupButtonsLayout->addWidget( buttonCancel, 0, 1 );
 
   QPushButton* buttonHelp = new QPushButton( GroupButtons );
   buttonHelp->setObjectName( "buttonHelp" );
   buttonHelp->setText( tr( "GEOM_BUT_HELP" ) ) ;
-  buttonHelp->setAutoDefault( TRUE );
+  buttonHelp->setAutoDefault( true );
   GroupButtonsLayout->addWidget( buttonHelp, 0, 2 );
   /***************************************************************/
   

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx
index 0ac5eb330aabdd9c3bcba9e91fc295ceda15d1a6..3a8640ba914abb636ffee72648a0de2ac5980a41 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx
@@ -78,7 +78,11 @@ GEOMToolsGUI_PublishDlg::GEOMToolsGUI_PublishDlg(QWidget* parent):
    SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
    headerItem->setIcon( 2, QIcon( resMgr->loadPixmap( "SUIT", tr( "ICON_DATAOBJ_VISIBLE" ) ) ) );
    myTreeWidget->setHeaderItem ( headerItem );
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    myTreeWidget->header()->setClickable( true );
+#else
+   myTreeWidget->header()->setSectionsClickable( true );
+#endif
    myTreeWidget->header()->setSortIndicatorShown( true );
    myTreeWidget->header()->moveSection( 2, 0 );
    myTreeWidget->setSortingEnabled( true );

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx
index d5e69e2ec838fdc6dd03e3cb1fc33bbeec6bd96f..6784a91d6aaa2b471287d870374b46689ce4705f 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx
@@ -222,9 +222,15 @@ void GEOMToolsGUI_ReduceStudyDlg::createTreeWidget( QTreeWidget* theTreeWidget )
   QTreeWidgetItem * headerItem = new QTreeWidgetItem( columnNames );
   theTreeWidget->setHeaderItem ( headerItem );
   theTreeWidget->header()->moveSection( 1, 0 );
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   theTreeWidget->header()->setClickable( true );
   theTreeWidget->header()->setMovable( false );
   theTreeWidget->header()->setResizeMode( 1, QHeaderView::ResizeToContents );
+#else
+  theTreeWidget->header()->setSectionsClickable( true );
+  theTreeWidget->header()->setSectionsMovable( false );
+  theTreeWidget->header()->setSectionResizeMode( 1, QHeaderView::ResizeToContents );
+#endif
   theTreeWidget->setSelectionMode( QAbstractItemView::ExtendedSelection );
 }
 

diff --git a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
index 99e8d185699de1d616214165dd3ac84546aa9d51..8580ae6ebb0ca701bb4440cdcf9af7e7f60fcd71 100755 (executable)
--- a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
+++ b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
@@ -18,13 +18,12 @@
 #
 
 INCLUDE(${SWIG_USE_FILE})
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}

diff --git a/src/GenerationGUI/CMakeLists.txt b/src/GenerationGUI/CMakeLists.txt
index b60f1dde6b0d767bff471d15b103adf154ae4376..ce182691f75bc0671171febe912bd8687165d0cd 100755 (executable)
--- a/src/GenerationGUI/CMakeLists.txt
+++ b/src/GenerationGUI/CMakeLists.txt
@@ -17,13 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -90,7 +89,7 @@ SET(_moc_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(GenerationGUI_SOURCES
   GenerationGUI.cxx

diff --git a/src/GroupGUI/CMakeLists.txt b/src/GroupGUI/CMakeLists.txt
index 73e18271bbad8586b320fa1d3d9df1ec762b64f8..08ace43678f9755f6b90d0a94d2c297558914315 100755 (executable)
--- a/src/GroupGUI/CMakeLists.txt
+++ b/src/GroupGUI/CMakeLists.txt
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -82,12 +80,12 @@ SET(_moc_HEADERS
   )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(GroupGUI_SOURCES
   GroupGUI.cxx

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index aec21881f3cfd50afd055b31effe0229429e5d53..c856096150462d128e40d21b502073a69a356c01 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -1098,7 +1098,7 @@ void GroupGUI_GroupDlg::activateSelection()
           int index = aSubShapesMap.FindIndex(aSubShape);
           QString anEntry = QString( "TEMP_" ) + anEntryBase + QString("_%1").arg(index);
           Handle(SALOME_InteractiveObject) io =
-            new SALOME_InteractiveObject(anEntry.toAscii(), "GEOM", "TEMP_IO");
+            new SALOME_InteractiveObject(anEntry.toLatin1(), "GEOM", "TEMP_IO");
           if ( myGroupIdList.contains( index ) ) {
             aDisplayer->SetColor( aCol );
           }

diff --git a/src/IGESPlugin/CMakeLists.txt b/src/IGESPlugin/CMakeLists.txt
index b380989f415c12ccb4a01b02398bf6c46f6fef78..dc97a326fdf489486194f50c9a31196717f4eb42 100644 (file)
--- a/src/IGESPlugin/CMakeLists.txt
+++ b/src/IGESPlugin/CMakeLists.txt
@@ -18,8 +18,7 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQtExt)
 ENDIF()
 
 # --- options ---
@@ -39,7 +38,6 @@ INCLUDE_DIRECTORIES(
   
 IF(SALOME_BUILD_GUI)
   INCLUDE_DIRECTORIES(
-    ${QT_INCLUDE_DIRS}
     ${GUI_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/src/OBJECT
     ${PROJECT_SOURCE_DIR}/src/GEOMGUI
@@ -110,7 +108,7 @@ ENDIF()
 
 IF(SALOME_BUILD_GUI)
   # sources / moc wrappings
-  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
   SET(IGESPluginGUI_SOURCES
     IGESPlugin_GUI.cxx
@@ -147,7 +145,7 @@ IF(SALOME_BUILD_GUI)
   TARGET_LINK_LIBRARIES(IGESPluginGUI ${_link_gui_LIBRARIES})
   INSTALL(TARGETS IGESPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   
-  QT4_INSTALL_TS_RESOURCES("${IGESPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+  QT_INSTALL_TS_RESOURCES("${IGESPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
 ENDIF()
 
 

diff --git a/src/IGESPlugin/IGESPlugin_ExportDlg.cxx b/src/IGESPlugin/IGESPlugin_ExportDlg.cxx
index cb667070f99dfe86f83d92a7b5a8ae55e24d42ea..a49db7ffc2e1cd0fc461be328bf45d37e6f1236b 100644 (file)
--- a/src/IGESPlugin/IGESPlugin_ExportDlg.cxx
+++ b/src/IGESPlugin/IGESPlugin_ExportDlg.cxx
@@ -69,7 +69,7 @@ QString IGESPlugin_ExportDlg::getFileName( const QString& initial, const QString
 
   IGESPlugin_ExportDlg fd( parent );
   fd.setFileMode( AnyFile );
-  fd.setFilters( fls );
+  fd.setNameFilters( fls );
   fd.setWindowTitle( caption );
   if ( !tmpfilename.isEmpty() )
     fd.processPath( tmpfilename );

diff --git a/src/Material/CMakeLists.txt b/src/Material/CMakeLists.txt
index f8957e5623f27760bb64ac97c6353f560d40afcd..c7f0291abcbe94a8622757a3df3cb7eb17bffd6b 100755 (executable)
--- a/src/Material/CMakeLists.txt
+++ b/src/Material/CMakeLists.txt
@@ -17,13 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
-
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}
@@ -65,7 +62,7 @@ SET(_moc_HEADERS Material_ResourceMgr.h)
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(Material_SOURCES
   Material_Model.cxx

diff --git a/src/MeasureGUI/CMakeLists.txt b/src/MeasureGUI/CMakeLists.txt
index eaae08f27afdae774af31ddf9153abbe10c31ee8..b5045cebe7d11fb09ff9fd95f993e80a845f4e1c 100755 (executable)
--- a/src/MeasureGUI/CMakeLists.txt
+++ b/src/MeasureGUI/CMakeLists.txt
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -139,12 +137,12 @@ IF(SALOME_USE_PLOT2DVIEWER)
 ENDIF()
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(MeasureGUI_SOURCES
   MeasureGUI.cxx
@@ -185,5 +183,3 @@ ENDIF()
 ADD_LIBRARY(MeasureGUI ${MeasureGUI_SOURCES})
 TARGET_LINK_LIBRARIES(MeasureGUI ${_link_LIBRARIES})
 INSTALL(TARGETS MeasureGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
-
-

diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt
index 60a7497caaa2ef518d931010770104d63812fc79..4e2373e6625c6d49ea9708a7a20b8f60b3b8d469 100755 (executable)
--- a/src/OBJECT/CMakeLists.txt
+++ b/src/OBJECT/CMakeLists.txt
@@ -17,7 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
 INCLUDE(${VTK_USE_FILE})
 
 # --- options ---
@@ -26,7 +25,6 @@ INCLUDE(${VTK_USE_FILE})
 INCLUDE_DIRECTORIES(
   ${VTK_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
-  ${QT_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}

diff --git a/src/OperationGUI/CMakeLists.txt b/src/OperationGUI/CMakeLists.txt
index 4fa28ace00c1a105ae30669dbfc143dcf7eb7f99..0f26e722e0014619447145a730b3a1a798cc590b 100755 (executable)
--- a/src/OperationGUI/CMakeLists.txt
+++ b/src/OperationGUI/CMakeLists.txt
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -94,12 +92,12 @@ SET(_moc_HEADERS
   )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(OperationGUI_SOURCES
   OperationGUI.cxx

diff --git a/src/PrimitiveGUI/CMakeLists.txt b/src/PrimitiveGUI/CMakeLists.txt
index e90b50c65780000b8ec98dfe7c05d33a412ffcba..876d2068f53a253bd73767e2e151be3a341ff520 100755 (executable)
--- a/src/PrimitiveGUI/CMakeLists.txt
+++ b/src/PrimitiveGUI/CMakeLists.txt
@@ -17,13 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
-
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -84,7 +81,7 @@ SET(_moc_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(PrimitiveGUI_SOURCES
   PrimitiveGUI.cxx

diff --git a/src/RepairGUI/CMakeLists.txt b/src/RepairGUI/CMakeLists.txt
index d9ae6fa297036529162433dab71a0711127fe2bc..39cd01713358e140c7532fbcadaa4b0e6539e18e 100755 (executable)
--- a/src/RepairGUI/CMakeLists.txt
+++ b/src/RepairGUI/CMakeLists.txt
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -110,12 +108,12 @@ SET(_moc_HEADERS
   )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(RepairGUI_SOURCES
   RepairGUI.cxx

diff --git a/src/RepairGUI/RepairGUI.cxx b/src/RepairGUI/RepairGUI.cxx
index 3eadcbe21d4c10477ba42b2e13410002cf991c93..fff787d5c994f7dd5f3e21956769d91b54f3d281 100644 (file)
--- a/src/RepairGUI/RepairGUI.cxx
+++ b/src/RepairGUI/RepairGUI.cxx
@@ -158,7 +158,11 @@ namespace
     const int nbCols = 2;
     QTableWidget* table = new QTableWidget( nbRows, nbCols, this );
     table->setEditTriggers( QAbstractItemView::NoEditTriggers );
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     table->horizontalHeader()->setResizeMode( 1, QHeaderView::Interactive );
+#else
+    table->horizontalHeader()->setSectionResizeMode( 1, QHeaderView::Interactive );
+#endif
     table->horizontalHeader()->setStretchLastSection( true );
 
     QStringList headers;

diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
index 673f29d6b7561546db266aecb65b6a05004f3f3c..21f39aef923e9d0fb9a59e2199d6f35954ce7ab1 100644 (file)
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
@@ -127,13 +127,13 @@ RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg( GeometryGUI* theGeometryGUI, Q
 //=======================================================================
 void RepairGUI_DivideEdgeDlg::ConstructorsClicked( int constructorId )
 {
-  myIsParameterGr->button( 0 )->setShown( constructorId == BY_PARAM );
-  myIsParameterGr->button( 1 )->setShown( constructorId == BY_PARAM );
-  myValEdt                    ->setShown( constructorId == BY_PARAM );
-  myValLbl                    ->setShown( constructorId == BY_PARAM );
-  GroupPoints->TextLabel2     ->setShown( constructorId == BY_POINT_PROJ );
-  GroupPoints->PushButton2    ->setShown( constructorId == BY_POINT_PROJ );
-  GroupPoints->LineEdit2      ->setShown( constructorId == BY_POINT_PROJ );
+  myIsParameterGr->button( 0 )->setVisible( constructorId == BY_PARAM );
+  myIsParameterGr->button( 1 )->setVisible( constructorId == BY_PARAM );
+  myValEdt                    ->setVisible( constructorId == BY_PARAM );
+  myValLbl                    ->setVisible( constructorId == BY_PARAM );
+  GroupPoints->TextLabel2     ->setVisible( constructorId == BY_POINT_PROJ );
+  GroupPoints->PushButton2    ->setVisible( constructorId == BY_POINT_PROJ );
+  GroupPoints->LineEdit2      ->setVisible( constructorId == BY_POINT_PROJ );
 
   initSelection();
 

diff --git a/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx b/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx
index ac1372811e1403a9d09a99955de34f124521d5d6..d6671dbbf4e7135598513d8d0b2284e3e797b2fe 100644 (file)
--- a/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx
@@ -69,8 +69,8 @@ RepairGUI_FuseEdgesDlg::RepairGUI_FuseEdgesDlg (GeometryGUI* theGeometryGUI,
   GroupVertexes->LineEdit1->setReadOnly(true);
   GroupVertexes->LineEdit2->setReadOnly(true);
 
-  GroupVertexes->TextLabel3->setShown(false);
-  GroupVertexes->SpinBox_DX->setShown(false);
+  GroupVertexes->TextLabel3->setVisible(false);
+  GroupVertexes->SpinBox_DX->setVisible(false);
 
   QVBoxLayout* layout = new QVBoxLayout (centralWidget());
   layout->setMargin(0);

diff --git a/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx b/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
index a66f9c18edb8ff46ca807b4aa2f72d589f16bc49..897348edc33d63b984973e78d32839210ef94d19 100644 (file)
--- a/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
+++ b/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
@@ -145,7 +145,7 @@ RepairGUI_InspectObjectDlg::TreeWidgetItem::TreeWidgetItem
   myShape( shape ),
   myTolerance (theTolerance)
 {
-  myIO = new SALOME_InteractiveObject( entry.toAscii(), "GEOM", "TEMP_IO" );
+  myIO = new SALOME_InteractiveObject( entry.toLatin1(), "GEOM", "TEMP_IO" );
   setFlags( flags() | Qt::ItemIsEditable );
 }
 
@@ -417,9 +417,15 @@ void RepairGUI_InspectObjectDlg::createTreeWidget(QTreeWidget *&theTreeObjects)
   headerItem->setIcon(1, myInvisible);
   theTreeObjects->setHeaderItem(headerItem);
   theTreeObjects->header()->moveSection(1, 0);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   theTreeObjects->header()->setClickable(true);
   theTreeObjects->header()->setMovable(false);
   theTreeObjects->header()->setResizeMode( 1, QHeaderView::ResizeToContents);
+#else
+  theTreeObjects->header()->setSectionsClickable(true);
+  theTreeObjects->header()->setSectionsMovable(false);
+  theTreeObjects->header()->setSectionResizeMode( 1, QHeaderView::ResizeToContents);
+#endif
   theTreeObjects->setSelectionMode(QAbstractItemView::ExtendedSelection);
   theTreeObjects->setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed);
   // set custom item delegate

diff --git a/src/STEPPlugin/CMakeLists.txt b/src/STEPPlugin/CMakeLists.txt
index 52d210920ba3c99563119c727f7385448699c791..aa335dbf00d4462f478d36bf98b63e10bcb783b2 100644 (file)
--- a/src/STEPPlugin/CMakeLists.txt
+++ b/src/STEPPlugin/CMakeLists.txt
@@ -18,8 +18,7 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQtExt)
 ENDIF()
 
 # --- options ---
@@ -39,7 +38,6 @@ INCLUDE_DIRECTORIES(
   
 IF(SALOME_BUILD_GUI)
   INCLUDE_DIRECTORIES(
-    ${QT_INCLUDE_DIRS}
     ${GUI_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/src/OBJECT
     ${PROJECT_SOURCE_DIR}/src/GEOMGUI
@@ -112,7 +110,7 @@ ENDIF()
 
 IF(SALOME_BUILD_GUI)
   # sources / moc wrappings
-  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
   SET(STEPPluginGUI_SOURCES
     STEPPlugin_GUI.cxx
@@ -149,7 +147,7 @@ IF(SALOME_BUILD_GUI)
   TARGET_LINK_LIBRARIES(STEPPluginGUI ${_link_gui_LIBRARIES})
   INSTALL(TARGETS STEPPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-  QT4_INSTALL_TS_RESOURCES("${STEPPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+  QT_INSTALL_TS_RESOURCES("${STEPPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
 ENDIF()
 
 

diff --git a/src/STEPPlugin/STEPPlugin_ExportDlg.cxx b/src/STEPPlugin/STEPPlugin_ExportDlg.cxx
index 2f8124b29a7f982b7ee90ab0768112c0ac92dc5c..476934dbf885c953c277f63aa8e87667a6fe71f7 100644 (file)
--- a/src/STEPPlugin/STEPPlugin_ExportDlg.cxx
+++ b/src/STEPPlugin/STEPPlugin_ExportDlg.cxx
@@ -89,7 +89,7 @@ QString STEPPlugin_ExportDlg::getFileName(const QString           &theInitial,
   STEPPlugin_ExportDlg aDlg(theParent);
 
   aDlg.setFileMode(AnyFile);
-  aDlg.setFilters(aFls);
+  aDlg.setNameFilters(aFls);
   aDlg.setWindowTitle(theCaption);
 
   if (!aTmpFileName.isEmpty()) {

diff --git a/src/STLPlugin/CMakeLists.txt b/src/STLPlugin/CMakeLists.txt
index 954610a780e0a1589a9c9c0a67d533d9d37b5700..36deae994186252f2da87b4ad7c1d5d7c44f213e 100644 (file)
--- a/src/STLPlugin/CMakeLists.txt
+++ b/src/STLPlugin/CMakeLists.txt
@@ -18,8 +18,7 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQtExt)
 ENDIF()
 
 # --- options ---
@@ -39,7 +38,6 @@ INCLUDE_DIRECTORIES(
   
 IF(SALOME_BUILD_GUI)
   INCLUDE_DIRECTORIES(
-    ${QT_INCLUDE_DIRS}
     ${GUI_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/src/OBJECT
     ${PROJECT_SOURCE_DIR}/src/GEOMGUI
@@ -110,7 +108,7 @@ ENDIF()
 
 IF(SALOME_BUILD_GUI)
   # sources / moc wrappings
-  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
   SET(STLPluginGUI_SOURCES
     STLPlugin_GUI.cxx
@@ -147,7 +145,7 @@ IF(SALOME_BUILD_GUI)
   TARGET_LINK_LIBRARIES(STLPluginGUI ${_link_gui_LIBRARIES})
   INSTALL(TARGETS STLPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   
-  QT4_INSTALL_TS_RESOURCES("${STLPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+  QT_INSTALL_TS_RESOURCES("${STLPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
 ENDIF()
 
 

diff --git a/src/STLPlugin/STLPlugin_ExportDlg.cxx b/src/STLPlugin/STLPlugin_ExportDlg.cxx
index 05616e15d330a1d7fd8644f4ff640669cf0c41fe..0d36f35e7f96c034f37b42bc26fb97f26ddffad5 100644 (file)
--- a/src/STLPlugin/STLPlugin_ExportDlg.cxx
+++ b/src/STLPlugin/STLPlugin_ExportDlg.cxx
@@ -175,7 +175,7 @@ QString STLPlugin_ExportDlg::getFileName( const Handle(SALOME_InteractiveObject)
 
   STLPlugin_ExportDlg fd( io, parent );
   fd.setFileMode( AnyFile );
-  fd.setFilters( fls );
+  fd.setNameFilters( fls );
   fd.setWindowTitle( caption );
   if ( !tmpfilename.isEmpty() )
     fd.processPath( tmpfilename );

diff --git a/src/ShapeRecognition/CMakeLists.txt b/src/ShapeRecognition/CMakeLists.txt
index 61f4072c682435c3bd92263ddbe4e2c624f2a2f4..7e4e7fd4ed36c4c7502069f2e66ced3ab50cc630 100755 (executable)
--- a/src/ShapeRecognition/CMakeLists.txt
+++ b/src/ShapeRecognition/CMakeLists.txt
@@ -17,7 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE( ${QT_USE_FILE} )
 
 # --- options ---
 
@@ -62,5 +61,3 @@ TARGET_LINK_LIBRARIES(GEOMShapeRec ${_link_LIBRARIES})
 INSTALL(TARGETS GEOMShapeRec EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 #INSTALL(FILES ${ShapeRecognition_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-
-

diff --git a/src/Tools/geom_plugins.py b/src/Tools/geom_plugins.py
index 39596159581e0d708e839bba2dbeaf9eecde8201..d9f72d4abf38e28c1738704d5f86006ced00be52 100644 (file)
--- a/src/Tools/geom_plugins.py
+++ b/src/Tools/geom_plugins.py
@@ -26,7 +26,7 @@ def t_shape_fluid(context):
     from salome.geom.t_shape import t_shape_dialog
     from salome.geom.t_shape import t_shape_progress
     import xalome
-    from PyQt4.QtGui import QMessageBox
+    from qtsalome import QMessageBox
     activeStudy = context.study
     
     dialog = t_shape_dialog.TShapeDialog()

diff --git a/src/Tools/t_shape/CMakeLists.txt b/src/Tools/t_shape/CMakeLists.txt
index 15394fdb258ee976e3b6fff6d200d38f709f4ce7..e4332a5e76d6cdbd347646951c33b537bf14d5e1 100644 (file)
--- a/src/Tools/t_shape/CMakeLists.txt
+++ b/src/Tools/t_shape/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 IF(SALOME_BUILD_GUI)
-  INCLUDE(UsePyQt4)
+  INCLUDE(UsePyQt)
 ENDIF()
 
 # --- scripts ---
@@ -42,7 +42,7 @@ IF(SALOME_BUILD_GUI)
     )
 
   # scripts / pyuic wrappings
-  PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
+  PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
 ENDIF()
 
 # --- rules ---

diff --git a/src/Tools/t_shape/t_shape_dialog.py b/src/Tools/t_shape/t_shape_dialog.py
index c385efd0c1f9b7d1699de620022d33aea2a492fb..7ee76c238433b402cd85f7ccabacb164dbf2f44f 100644 (file)
--- a/src/Tools/t_shape/t_shape_dialog.py
+++ b/src/Tools/t_shape/t_shape_dialog.py
@@ -20,15 +20,14 @@
 # Author : Renaud Nédélec (OpenCascade S.A.S)
 
 import sys
-from PyQt4 import QtGui
-from PyQt4 import QtCore
+from qtsalome import *
 
 from t_shape_dialog_ui import Ui_Dialog
 
 
-class TShapeDialog(QtGui.QDialog):
+class TShapeDialog(QDialog):
     def __init__(self):
-      QtGui.QDialog.__init__(self, None, QtCore.Qt.Tool)
+      QDialog.__init__(self, None, Qt.Tool)
       # Set up the user interface from Designer.
       self.ui = Ui_Dialog()
       self.ui.setupUi(self)
@@ -43,7 +42,7 @@ class TShapeDialog(QtGui.QDialog):
    
     def accept(self):
       self._wasOk = True
-      QtGui.QDialog.accept(self)
+      QDialog.accept(self)
       
     def getData(self):
       r1 = self.ui.dsb_bigRadius.value()
@@ -58,7 +57,7 @@ class TShapeDialog(QtGui.QDialog):
 
     def reject(self):
         self._wasOk = False
-        QtGui.QDialog.reject(self)
+        QDialog.reject(self)
 
     def wasOk(self):
         return self._wasOk
@@ -70,7 +69,7 @@ class TShapeDialog(QtGui.QDialog):
 
 def main( args ):
     import sys
-    app = QtGui.QApplication(sys.argv)
+    app = QApplication(sys.argv)
     Dialog = TShapeDialog()
     ui = Ui_Dialog()
     ui.setupUi(Dialog)

diff --git a/src/Tools/t_shape/t_shape_progress.py b/src/Tools/t_shape/t_shape_progress.py
index 38f804502aa86cd8022731ab96fdc20a82c7808b..96415d1ac6f557e8ce2641cb11133eaeadfcf5f0 100644 (file)
--- a/src/Tools/t_shape/t_shape_progress.py
+++ b/src/Tools/t_shape/t_shape_progress.py
@@ -20,15 +20,14 @@
 # Author : Renaud Nédélec (OpenCascade S.A.S)
 
 from salome.geom.t_shape import t_shape_builder
-from PyQt4.QtGui import QProgressDialog
-from PyQt4 import QtCore
+from qtsalome import *
 
 class t_shape_progress(QProgressDialog):
     _totSteps = 0
     _nmaxSteps = 27
     
     def __init__(self, parent=None):
-      QProgressDialog.__init__(self, "t_shape fluid build", "stop", 0, self._nmaxSteps, parent, QtCore.Qt.Tool)
+      QProgressDialog.__init__(self, "t_shape fluid build", "stop", 0, self._nmaxSteps, parent, Qt.Tool)
       self.show()
         
     def run(self, activeStudy, r1, r2, h1, h2, thickness):

diff --git a/src/TransformationGUI/CMakeLists.txt b/src/TransformationGUI/CMakeLists.txt
index 2b4b75858891ce0f7f6ce2796e9b77d64e9642e6..94996f4bda0c22e6aa1109806fa6539d8cbd0034 100755 (executable)
--- a/src/TransformationGUI/CMakeLists.txt
+++ b/src/TransformationGUI/CMakeLists.txt
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -95,12 +93,12 @@ SET(_moc_HEADERS
   )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(TransformationGUI_SOURCES
   TransformationGUI.cxx

diff --git a/src/VTKPlugin/CMakeLists.txt b/src/VTKPlugin/CMakeLists.txt
index 9f67135eb18e3d0c418b8bac026ee0b3db368869..dbf3c5bcb6ee35291108edd8ae4e32956da72cf2 100644 (file)
--- a/src/VTKPlugin/CMakeLists.txt
+++ b/src/VTKPlugin/CMakeLists.txt
@@ -18,8 +18,7 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQtExt)
 ENDIF()
 
 # --- options ---
@@ -41,7 +40,6 @@ INCLUDE_DIRECTORIES(
   
 IF(SALOME_BUILD_GUI)
   INCLUDE_DIRECTORIES(
-    ${QT_INCLUDE_DIRS}
     ${GUI_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/src/OBJECT
     ${PROJECT_SOURCE_DIR}/src/GEOMGUI
@@ -112,7 +110,7 @@ ENDIF()
 
 IF(SALOME_BUILD_GUI)
   # sources / moc wrappings
-  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
   SET(VTKPluginGUI_SOURCES
     VTKPlugin_GUI.cxx
@@ -148,7 +146,7 @@ IF(SALOME_BUILD_GUI)
   TARGET_LINK_LIBRARIES(VTKPluginGUI ${_link_gui_LIBRARIES})
   INSTALL(TARGETS VTKPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   
-  QT4_INSTALL_TS_RESOURCES("${VTKPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+  QT_INSTALL_TS_RESOURCES("${VTKPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
 ENDIF()
 
 

diff --git a/src/VTKPlugin/VTKPlugin_ExportDlg.cxx b/src/VTKPlugin/VTKPlugin_ExportDlg.cxx
index b4af670b54377dce401445a22d1ec0ac019378fe..40e69f4f1d225ad788fc2222fe84dc49ace880bb 100644 (file)
--- a/src/VTKPlugin/VTKPlugin_ExportDlg.cxx
+++ b/src/VTKPlugin/VTKPlugin_ExportDlg.cxx
@@ -99,7 +99,7 @@ QString VTKPlugin_ExportDlg::getFileName( const Handle(SALOME_InteractiveObject)
 
   VTKPlugin_ExportDlg fd( io, parent );
   fd.setFileMode( AnyFile );
-  fd.setFilters( fls );
+  fd.setNameFilters( fls );
   fd.setWindowTitle( caption );
   if ( !tmpfilename.isEmpty() )
     fd.processPath( tmpfilename );

diff --git a/src/XAOPlugin/CMakeLists.txt b/src/XAOPlugin/CMakeLists.txt
index 47d6a2ff307ebe59801cb1138f8521ce6a175c74..1f9ed1375ff4ebaab6edda4550e77b9a2edc1d91 100644 (file)
--- a/src/XAOPlugin/CMakeLists.txt
+++ b/src/XAOPlugin/CMakeLists.txt
@@ -18,8 +18,7 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQtExt)
 ENDIF()
 
 # --- options ---
@@ -40,7 +39,6 @@ INCLUDE_DIRECTORIES(
   
 IF(SALOME_BUILD_GUI)
   INCLUDE_DIRECTORIES(
-    ${QT_INCLUDE_DIRS}
     ${GUI_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/src/OBJECT
     ${PROJECT_SOURCE_DIR}/src/GEOMGUI
@@ -111,7 +109,7 @@ ENDIF()
 
 IF(SALOME_BUILD_GUI)
   # sources / moc wrappings
-  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
   SET(XAOPluginGUI_SOURCES
     XAOPlugin_GUI.cxx
@@ -149,7 +147,7 @@ IF(SALOME_BUILD_GUI)
   TARGET_LINK_LIBRARIES(XAOPluginGUI ${_link_gui_LIBRARIES})
   INSTALL(TARGETS XAOPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   
-  QT4_INSTALL_TS_RESOURCES("${XAOPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+  QT_INSTALL_TS_RESOURCES("${XAOPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
 ENDIF()