Merge Qt5 porting.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5d92d840288a11ec4158051e3038b89de6b8157..9ef75654aef106c7df8ffda9b294ae5186eb3400 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,8 +158,12 @@ ENDIF()
 IF(SALOME_BUILD_GUI)
   # Graphviz
   FIND_PACKAGE(SalomeGraphviz  REQUIRED)
-  # Qt4
-  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+  # Qt
+  IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+    FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+  ELSE()
+    FIND_PACKAGE(SalomeQt5 REQUIRED)
+  ENDIF()
 ENDIF(SALOME_BUILD_GUI)
 
 ##
@@ -308,18 +312,26 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 #      Ensure the variables are always defined for the configure:
 SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}")
 SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
-SET(QT4_ROOT_DIR "${QT4_ROOT_DIR}")
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+  SET(QT_ROOT_DIR "${QT4_ROOT_DIR}")
+ELSE()
+  SET(QT_ROOT_DIR "${QT5_ROOT_DIR}")
+ENDIF()
  
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
 
 # Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
-SALOME_CONFIGURE_PREPARE(Qt4)
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+  SALOME_CONFIGURE_PREPARE(Qt4)
+ELSE()
+  SALOME_CONFIGURE_PREPARE(Qt5)
+ENDIF()
 
 CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in 
     ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
     INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
     PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
-    KERNEL_ROOT_DIR GUI_ROOT_DIR QT4_ROOT_DIR)
+    KERNEL_ROOT_DIR GUI_ROOT_DIR QT_ROOT_DIR)
 
 #   - in the install tree (VSR 16/08/2013: TEMPORARILY COMMENT THIS - TO REMOVE?):
 #       Get the relative path of the include directory so 
@@ -329,7 +341,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
 #    ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake
 #    INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
 #    PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX 
-#    KERNEL_ROOT_DIR GUI_ROOT_DIR QT4_ROOT_DIR)
+#    KERNEL_ROOT_DIR GUI_ROOT_DIR QT_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}

diff --git a/src/genericgui/CMakeLists.txt b/src/genericgui/CMakeLists.txt
index 37095fa7689f234ff173d1eaac65d3f203068105..0dc09a30de190c1e8231788ab24e02b520d447cc 100644 (file)
--- a/src/genericgui/CMakeLists.txt
+++ b/src/genericgui/CMakeLists.txt
@@ -17,6 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(UseQtExt)
+
 # --- options ---
 
 # additional include directories
@@ -160,12 +162,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(GenericGui_SOURCES
   GenericGuiExport.hxx

diff --git a/src/genericgui/CatalogWidget.cxx b/src/genericgui/CatalogWidget.cxx
index eec1a0c096bd57e7eb471057fc1d9ac8d0343ffa..793916e238faff40f2d78dec55ee8992f0e577be 100644 (file)
--- a/src/genericgui/CatalogWidget.cxx
+++ b/src/genericgui/CatalogWidget.cxx
@@ -241,7 +241,7 @@ void CatalogWidget::startDrag(Qt::DropActions supportedActions)
           drag = new QDrag(this);
           mime = new ItemMimeData;
           drag->setMimeData(mime);
-          mime->setData(mimeType, mimeInfo.toAscii());
+          mime->setData(mimeType, mimeInfo.toLatin1());
           drag->setPixmap(pixmap);
 
           theMimeInfo = mimeInfo;

diff --git a/src/genericgui/GenericGui.cxx b/src/genericgui/GenericGui.cxx
index 67d02f5811ad1f851ea797b925ed1e22bb139ae0..023a88cfd4ffb38c122947386a9585e7e56a53db 100644 (file)
--- a/src/genericgui/GenericGui.cxx
+++ b/src/genericgui/GenericGui.cxx
@@ -1437,11 +1437,11 @@ void GenericGui::onImportSupervSchema()
       QString aCall = "salomeloader."+ fileExt+ " "+ fn + " " + tmpFileName + " > " + tmpOutput;
       DEBTRACE(aCall.toStdString());
       
-      int ret = system(aCall.toAscii());
+      int ret = system(aCall.toLatin1());
       if(ret != 0)
         {
           // --- read file with logs
-          fstream f(tmpOutput.toAscii());
+          fstream f(tmpOutput.toLatin1());
           stringstream hfile;
           hfile << f.rdbuf();
           f.close();
@@ -1516,8 +1516,8 @@ QString GenericGui::getSaveFileName(const QString& fileName)
   filters << "XML files (*.xml)"
           << "Any files (*)";
   dialog.setFileMode(QFileDialog::AnyFile);
-  dialog.setFilters(filters);
-  dialog.selectFilter("(*.xml)");
+  dialog.setNameFilters(filters);
+  dialog.selectNameFilter("(*.xml)");
   dialog.setDefaultSuffix("xml");
   dialog.setConfirmOverwrite(true);
   //dialog.setConfirmOverwrite(false);  // bug Qt4.3.3

diff --git a/src/genericgui/GuiEditor.cxx b/src/genericgui/GuiEditor.cxx
index ecbe765d4cde91e0689ac59f6352d7820d494bbb..da78dbb9de729622b246972ab5542d99ed4ab209 100644 (file)
--- a/src/genericgui/GuiEditor.cxx
+++ b/src/genericgui/GuiEditor.cxx
@@ -716,7 +716,7 @@ void GuiEditor::showRedo(QWidget *parent)
 QString GuiEditor::asciiFilter(const QString & name)
 {
   DEBTRACE(name.toStdString());
-  string aName = name.toAscii().data();
+  string aName = name.toLatin1().data();
   DEBTRACE(aName);
   for (int i=0; i < aName.size(); i++)
     {

diff --git a/src/genericgui/GuiExecutor.cxx b/src/genericgui/GuiExecutor.cxx
index 4bd977c69451a22148d5ac76b68957558d519ee6..e0b30fd191df809436ea1da06b1d800d79b15097 100644 (file)
--- a/src/genericgui/GuiExecutor.cxx
+++ b/src/genericgui/GuiExecutor.cxx
@@ -116,7 +116,7 @@ void GuiExecutor::startResumeDataflow(bool initialize)
   if (CORBA::is_nil(_procRef))
     {
       DEBTRACE("init _procRef");
-      _procRef = _engineRef->LoadProc(_context->getFileName().toAscii());
+      _procRef = _engineRef->LoadProc(_context->getFileName().toLatin1());
       registerStatusObservers();
       DEBTRACE("_procRef init");
     }

diff --git a/src/genericgui/ListJobs_GUI.hxx b/src/genericgui/ListJobs_GUI.hxx
index 152748387fde40bfe8fd68b15c09de6b0d22c9e8..25b9bd42492ec7f6b1dbe7f83fc977554c8eefde 100644 (file)
--- a/src/genericgui/ListJobs_GUI.hxx
+++ b/src/genericgui/ListJobs_GUI.hxx
@@ -20,7 +20,11 @@
 #ifndef LISTJOBS_GUI_H
 #define LISTJOBS_GUI_H
 
+#include <QtCore/QtGlobal>
 #include <QtGui/QtGui>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWidgets/QtWidgets>
+#endif
 #include "SALOME_NamingService.hxx"
 #include "SALOME_Launcher.hh"
 

diff --git a/src/genericgui/Scene.cxx b/src/genericgui/Scene.cxx
index a47305288a3f8093b98291cb63729a1d8a9915b8..5af74493c110117ae58e13bc4621a4d20738d850 100644 (file)
--- a/src/genericgui/Scene.cxx
+++ b/src/genericgui/Scene.cxx
@@ -69,7 +69,7 @@ bool Scene::isZooming()
 void Scene::helpEvent(QGraphicsSceneHelpEvent *event)
 {
   DEBTRACE("Scene::helpEvent");
-  QGraphicsItem *qit = itemAt(event->scenePos());
+  QGraphicsItem *qit = itemAt(event->scenePos(), QTransform());
   SceneItem * item = dynamic_cast<SceneItem*>(qit);
   if (item)
     {

diff --git a/src/genericgui/SceneBlocItem.cxx b/src/genericgui/SceneBlocItem.cxx
index 329bd38e8b3ca4cd503a6f2fcdd62a96e477cc72..443cde8d850248a754caa889c6b3a774c7efc5cb 100644 (file)
--- a/src/genericgui/SceneBlocItem.cxx
+++ b/src/genericgui/SceneBlocItem.cxx
@@ -203,8 +203,8 @@ void  SceneBlocItem::getNodesInfo(YACS::ENGINE::ComposedNode *cnode)
       width  = QString(_format.c_str()).arg(lw, 0, 'g', 3);
 
       DEBTRACE(agnameof(aNode) << " (" << nh << "," << nw << ") = (" << height.toStdString()  << " ; " << width.toStdString() <<")");
-      agset(aNode, const_cast<char*>("height"),    height.toAscii().data());
-      agset(aNode, const_cast<char*>("width"),     width.toAscii().data());
+      agset(aNode, const_cast<char*>("height"),    height.toLatin1().data());
+      agset(aNode, const_cast<char*>("width"),     width.toLatin1().data());
       agset(aNode, const_cast<char*>("shape"),     const_cast<char*>("box") );
       agset(aNode, const_cast<char*>("fixedsize"), const_cast<char*>("true") );
     }

diff --git a/src/genericgui/SceneItem.cxx b/src/genericgui/SceneItem.cxx
index 561243f7bdad4d96becfc816201783ec89de89e3..17f31622264495afe23d7922cfb78abc6dceab6c 100644 (file)
--- a/src/genericgui/SceneItem.cxx
+++ b/src/genericgui/SceneItem.cxx
@@ -197,7 +197,7 @@ SceneItem::SceneItem(QGraphicsScene *scene, SceneItem *parent,
   setToolTip(_label);
   DEBTRACE("SceneItem::SceneItem "<<label.toStdString()<<" "<<this<<" "<<_parent<<" "<< _level); 
   setFlag(QGraphicsItem::ItemIsSelectable);
-  setAcceptsHoverEvents(true);
+  setAcceptHoverEvents(true);
 }
 
 SceneItem::~SceneItem()

diff --git a/src/genericgui/SchemaProcItem.cxx b/src/genericgui/SchemaProcItem.cxx
index 7f5ad9ff7df6eedeaf28f40e44dbdacb1722f4cd..be002251bdec0d7a5841a3f1f0c84b5fe3970a36 100644 (file)
--- a/src/genericgui/SchemaProcItem.cxx
+++ b/src/genericgui/SchemaProcItem.cxx
@@ -65,7 +65,7 @@ void SchemaProcItem::setExecState(int execState)
     default:                      sc = YACS::HMI::Resource::UNKNOWN          ; stateDef = "Unknown Status";
    }
   _itemData.replace(YState, stateDef);
-  _itemForeground.replace(YState, Qt::darkBlue);
+  _itemForeground.replace(YState, QColor(Qt::darkBlue));
   _itemBackground.replace(YState, sc);
 }
 

diff --git a/src/salomegui/CMakeLists.txt b/src/salomegui/CMakeLists.txt
index e64460b37f10d6fe45a405c8c39bf7a805e3a6e5..52111884db216703085e4c0d708a24241ae93e00 100644 (file)
--- a/src/salomegui/CMakeLists.txt
+++ b/src/salomegui/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
@@ -90,12 +89,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(YACS_SOURCES
   Yacsgui.cxx
@@ -113,7 +112,7 @@ TARGET_LINK_LIBRARIES(YACS ${_link_LIBRARIES})
 INSTALL(TARGETS YACS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${YACS_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${YACS_RESOURCES}" "${SALOME_YACS_INSTALL_RES_DATA}")        
+QT_INSTALL_TS_RESOURCES("${YACS_RESOURCES}" "${SALOME_YACS_INSTALL_RES_DATA}") 
 
 INSTALL(FILES ${_res_files} DESTINATION ${SALOME_YACS_INSTALL_RES_DATA})
 SALOME_CONFIGURE_FILE(resources/YACSCatalog.xml.in 

diff --git a/src/salomewrap/CMakeLists.txt b/src/salomewrap/CMakeLists.txt
index 76713bd65d77693b19cd5f74cfafb5fcba8e7666..6888e60913435eda3c68b470c5a14bb7a23741b0 100644 (file)
--- a/src/salomewrap/CMakeLists.txt
+++ b/src/salomewrap/CMakeLists.txt
@@ -17,14 +17,13 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
-  ${QT_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/bases
@@ -65,7 +64,7 @@ SET(_moc_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(SalomeWrap_SOURCES
   SalomeWrapExport.hxx