From f3c62a0c0bb910829146673a13bfe636b5596e51 Mon Sep 17 00:00:00 2001 From: imn Date: Fri, 20 Nov 2015 21:31:07 +0300 Subject: [PATCH] Merge Qt5 porting. --- CMakeLists.txt | 9 ++++++--- src/AdvancedGUI/CMakeLists.txt | 10 ++++------ src/BREPPlugin/CMakeLists.txt | 8 +++----- src/BasicGUI/BasicGUI_PointDlg.cxx | 10 +++++----- src/BasicGUI/CMakeLists.txt | 5 ++--- src/BlocksGUI/CMakeLists.txt | 8 +++----- src/BooleanGUI/CMakeLists.txt | 8 +++----- src/BuildGUI/BuildGUI_FaceDlg.cxx | 5 +++++ src/BuildGUI/CMakeLists.txt | 8 +++----- src/CurveCreator/CMakeLists.txt | 6 ++---- src/CurveCreator/CurveCreator_TreeView.cxx | 6 ++++++ src/DependencyTree/CMakeLists.txt | 6 +++--- src/DependencyTree/DependencyTree_Arrow.cxx | 4 ++++ src/DisplayGUI/CMakeLists.txt | 4 ---- src/DlgRef/CMakeLists.txt | 6 +++--- src/EntityGUI/CMakeLists.txt | 8 +++----- src/EntityGUI/EntityGUI_FieldDlg.cxx | 2 +- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 6 +++--- src/GEOMBase/CMakeLists.txt | 5 +---- src/GEOMFiltersSelection/CMakeLists.txt | 3 --- src/GEOMGUI/CMakeLists.txt | 10 ++++------ src/GEOMGUI/GEOMGUI.cxx | 12 ++++++------ src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx | 4 ++++ src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx | 5 ++++- src/GEOMToolsGUI/CMakeLists.txt | 5 +---- src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx | 10 +++++----- src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx | 10 +++++----- src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx | 10 +++++----- src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx | 4 ++++ src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx | 6 ++++++ src/GEOM_SWIG_WITHIHM/CMakeLists.txt | 3 +-- src/GenerationGUI/CMakeLists.txt | 5 ++--- src/GroupGUI/CMakeLists.txt | 8 +++----- src/GroupGUI/GroupGUI_GroupDlg.cxx | 2 +- src/IGESPlugin/CMakeLists.txt | 8 +++----- src/IGESPlugin/IGESPlugin_ExportDlg.cxx | 2 +- src/Material/CMakeLists.txt | 5 +---- src/MeasureGUI/CMakeLists.txt | 10 +++------- src/OBJECT/CMakeLists.txt | 2 -- src/OperationGUI/CMakeLists.txt | 8 +++----- src/PrimitiveGUI/CMakeLists.txt | 5 +---- src/RepairGUI/CMakeLists.txt | 8 +++----- src/RepairGUI/RepairGUI.cxx | 4 ++++ src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx | 14 +++++++------- src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx | 4 ++-- src/RepairGUI/RepairGUI_InspectObjectDlg.cxx | 8 +++++++- src/STEPPlugin/CMakeLists.txt | 8 +++----- src/STEPPlugin/STEPPlugin_ExportDlg.cxx | 2 +- src/STLPlugin/CMakeLists.txt | 8 +++----- src/STLPlugin/STLPlugin_ExportDlg.cxx | 2 +- src/ShapeRecognition/CMakeLists.txt | 3 --- src/TransformationGUI/CMakeLists.txt | 8 +++----- src/VTKPlugin/CMakeLists.txt | 8 +++----- src/VTKPlugin/VTKPlugin_ExportDlg.cxx | 2 +- src/XAOPlugin/CMakeLists.txt | 8 +++----- 55 files changed, 164 insertions(+), 184 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 828cfb7f4..66d01b356 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,9 +124,12 @@ ENDIF(SALOME_BUILD_GUI) ## IF(SALOME_BUILD_GUI) - - # Qt4 - FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml) + # Qt + IF(NOT SALOME_GUI_BUILD_WITH_QT5) + FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL QtNetwork) + ELSE() + FIND_PACKAGE(SalomeQt5 REQUIRED) + ENDIF() ENDIF(SALOME_BUILD_GUI) ## diff --git a/src/AdvancedGUI/CMakeLists.txt b/src/AdvancedGUI/CMakeLists.txt index b2df1cc47..6a023ac70 100755 --- 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 0372c1e64..7db89bde3 100644 --- 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 96a989a88..021592e51 100644 --- 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 3a4821820..769c8092c 100755 --- 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 ebc68572c..a365598d3 100755 --- 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 e7c9b7850..f9f27055b 100755 --- 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 d474817f1..afb657109 100644 --- 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 37bcff647..d3b92ad52 100755 --- 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 c085fc69f..89b7bcd27 100644 --- 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 bb0f8545b..148fabaab 100644 --- 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 0aa01462a..31ec9a39a 100644 --- 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 d7e38c5f6..b558f3347 100644 --- 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 7a9d92208..980c5097a 100755 --- 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 ac45eab23..6fa1dac24 100755 --- 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 0bb93f921..15778cb7c 100755 --- 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 6e887f941..aab2def9b 100644 --- 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 6b0248b08..6749738fd 100644 --- 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 f3cc03f26..a6b58e6a5 100755 --- 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 d999542d4..89669a29b 100755 --- 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 c5e9e928f..d6e2f5d6f 100755 --- 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 f74393250..05dabb9fe 100644 --- 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 35a59ccfb..5ab93cee0 100644 --- 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 2c00a3bd4..47ab21c60 100644 --- 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 cb3e004cb..96380bee2 100755 --- 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 f977e08d9..1d8bc588b 100644 --- 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 95713739c..bfadece29 100644 --- 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 ab1ea6692..724346eb8 100644 --- 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 0ac5eb330..3a8640ba9 100644 --- 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 d5e69e2ec..6784a91d6 100644 --- 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 99e8d1856..8580ae6eb 100755 --- 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 b60f1dde6..ce182691f 100755 --- 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 73e18271b..08ace4367 100755 --- 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 5bf351f85..52a6cbe78 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -1092,7 +1092,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 b380989f4..dc97a326f 100644 --- 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 cb667070f..a49db7ffc 100644 --- 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 f8957e562..c7f0291ab 100755 --- 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 eaae08f27..b5045cebe 100755 --- 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 60a7497ca..4e2373e66 100755 --- 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 4fa28ace0..0f26e722e 100755 --- 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 e90b50c65..876d2068f 100755 --- 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 d9ae6fa29..39cd01713 100755 --- 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 3eadcbe21..fff787d5c 100644 --- 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 673f29d6b..21f39aef9 100644 --- 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 ac1372811..d6671dbbf 100644 --- 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 a66f9c18e..897348edc 100644 --- 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 52d210920..aa335dbf0 100644 --- 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 2f8124b29..476934dbf 100644 --- 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 954610a78..36deae994 100644 --- 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 05616e15d..0d36f35e7 100644 --- 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 61f4072c6..7e4e7fd4e 100755 --- 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/TransformationGUI/CMakeLists.txt b/src/TransformationGUI/CMakeLists.txt index 2b4b75858..94996f4bd 100755 --- 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 9f67135eb..dbf3c5bcb 100644 --- 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 b4af670b5..40e69f4f1 100644 --- 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 47d6a2ff3..1f9ed1375 100644 --- 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() -- 2.30.2