Merge branch 'master' into gni/adaptation

diff --cc CMakeLists.txt
Simple merge

diff --cc src/SMESHGUI/SMESHGUI.cxx
index 27fe6571be075e73c64e7ea0a51cff4d5e34349b,80211ac67b9cbf7fea19bd66d4fd8801fb7c4728..6ed14a43586ef35675652222a197c194f98cb0ec
--- 1/src/SMESHGUI/SMESHGUI.cxx
--- 2/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@@ -4758,19 -4704,11 +4758,19 @@@ void SMESHGUI::initialize( CAM_Applicat
    createPopupItem( SMESHOp::OpEditHypothesis,    OB, hypo, "&& isEditableHyp");
    createPopupItem( SMESHOp::OpUnassign,          OB, hyp_alg );
    popupMgr()->insert( separator(), -1, 0 );
-   createPopupItem( SMESHOp::OpConvertMeshToQuadratic, OB, mesh_submesh );
+   createPopupItem( SMESHOp::OpConvertMeshToQuadratic, OB, mesh_submesh, "&& " + hasElems );
    createPopupItem( SMESHOp::OpCreateBoundaryElements, OB, mesh_group, "&& selcount=1 && dim>=2");
 -  //popupMgr()->insert( separator(), -1, 0 );
 +  popupMgr()->insert( separator(), -1, 0 );
  
 -  //popupMgr()->insert( separator(), -1, 0 );
 +  // Adaptation - begin
 +  createPopupItem( SMESHOp::OpUniformRefinement,    OB, mesh );
 +  createPopupItem( SMESHOp::OpHONewCase,            OB, mesh );
 +//   createPopupItem( SMESHOp::OpHOCaseFollow,         OB, mesh );
 +//   createPopupItem( SMESHOp::OpHONewIter,            OB, mesh );
 +//   createPopupItem( SMESHOp::OpHOIterCompute,        OB, mesh );
 +//   createPopupItem( SMESHOp::OpHOIterComputePublish, OB, mesh );
 +  createPopupItem( SMESHOp::OpMGAdapt,              OB, mesh );
 +  // Adaptation - end
  
    QString only_one_non_empty = QString( " && %1=1 && numberOfNodes>0" ).arg( dc );
    QString multiple_non_empty = QString( " && %1>0 && numberOfNodes>0" ).arg( dc );