Merge branch 'rnv/23406'

diff --cc src/SUITApp/SUITApp.cxx
index 979783334852ad305733f82479eb07a5278fa09e,979783334852ad305733f82479eb07a5278fa09e..8c1fd4b6c84d9916e7f3dd0a8a0cff4ec81d726c
--- 1/src/SUITApp/SUITApp.cxx
--- 2/src/SUITApp/SUITApp.cxx
+++ b/src/SUITApp/SUITApp.cxx
@@@ -57,6 -57,6 +57,9 @@@
  #include <QRegExp>
  #include <QString>
  #include <QStringList>
++#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
++#include <QSurfaceFormat>
++#endif
  
  #include <stdlib.h>
  
@@@ -179,6 -179,6 +182,15 @@@ int main( int argc, char* argv[] 
      }
    }
  
++#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
++  // initialization of the X11 visual on Linux
++  QSurfaceFormat format;
++  format.setDepthBufferSize(16);
++  format.setStencilBufferSize(1);
++  format.setProfile(QSurfaceFormat::CompatibilityProfile);
++  QSurfaceFormat::setDefaultFormat(format);
++#endif
++
    // add <qtdir>/plugins directory to the pluins search path for image plugins
    QString qtdir = Qtx::qtDir( "plugins" );
    if ( !qtdir.isEmpty() )

diff --cc src/Session/SALOME_Session_Server.cxx
Simple merge