Merge Qt5 porting.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee55d82706d53f2ac657224f65463ff7ddd40293..95130433319c6800429e608f943e03d2fef07ffb 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,8 +89,11 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 ##
 FIND_PACKAGE(SalomeCAS REQUIRED)
 FIND_PACKAGE(SalomeVTK REQUIRED)
-FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-INCLUDE(${QT_USE_FILE})
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+ELSE()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
+ENDIF()
 
 # Find ATOMGEN
 # ===========

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx
index fb08b7902b3663da31029fc5f9c1a76eab02bad9..0939279eb63e4a964f7d008598dcdfc174ad83ca 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx
@@ -39,7 +39,7 @@ ATOMSOLVGUI_TransparencyDlg::ATOMSOLVGUI_TransparencyDlg( QWidget* parent, const
 
   resize(152, 107); 
   setWindowTitle(tr("TRANSPARENCY_DLG_TITLE"));
-  setSizeGripEnabled(TRUE);
+  setSizeGripEnabled(true);
   QGridLayout* lay = new QGridLayout(this); 
   lay->setSpacing(6);
   lay->setMargin(11);
@@ -53,13 +53,13 @@ ATOMSOLVGUI_TransparencyDlg::ATOMSOLVGUI_TransparencyDlg( QWidget* parent, const
   
   QPushButton* buttonOk = new QPushButton( GroupButtons );
   buttonOk->setText( tr( "BUT_OK" ) );
-  buttonOk->setAutoDefault( TRUE );
-  buttonOk->setDefault( TRUE );
+  buttonOk->setAutoDefault( true );
+  buttonOk->setDefault( true );
 
   QPushButton* buttonHelp = new QPushButton( GroupButtons );
   buttonHelp->setText( tr( "BUT_HELP" ) );
-  buttonHelp->setAutoDefault( TRUE );
-  buttonHelp->setDefault( TRUE );
+  buttonHelp->setAutoDefault( true );
+  buttonHelp->setDefault( true );
   
   GroupButtonsLayout->addWidget( buttonOk, 0, 0 );
   GroupButtonsLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1 );

diff --git a/src/ATOMSOLVGUI/CMakeLists.txt b/src/ATOMSOLVGUI/CMakeLists.txt
index f82f40d80c23b9d65e6dfd367b6df51fd2b61f5f..21573fbd71be39eabf162ec2ffbd579d1acac211 100644 (file)
--- a/src/ATOMSOLVGUI/CMakeLists.txt
+++ b/src/ATOMSOLVGUI/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 # additional include directories
@@ -72,7 +72,7 @@ SET(ATOMSOLVGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / static
 SET(_other_SOURCES
@@ -103,4 +103,4 @@ TARGET_LINK_LIBRARIES(ATOMSOLV ${_link_LIBRARIES} )
 INSTALL(TARGETS ATOMSOLV EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${ATOMSOLVGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_ATOMSOLV_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_ATOMSOLV_INSTALL_RES_DATA}")