Merge branch 'V7_dev' into V8_0_0_BR

diff --combined src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
index 609aaf77c6f82587e5688f145014dc2b5bc7f83f,f130b4e32565c776625c9413d0e52bb8b20b3429..389409921f543aa777a474b319c99e54c2b26f54
--- 1/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
--- 2/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
@@@ -120,7 -120,7 +120,7 @@@ namespac
    PyModuleHelper* getPythonHelper()
    {
      LightApp_Module* module = getActiveModule();
 -    PyModuleHelper* helper = module ? qFindChild<PyModuleHelper*>( module, "python_module_helper" ) : 0;
 +    PyModuleHelper* helper = module ? module->findChild<PyModuleHelper*>( "python_module_helper" ) : 0;
      return helper;
    }
    
@@@ -500,7 -500,7 +500,7 @@@ public
    virtual void Execute()
    {
      LightApp_Application* anApp = getApplication();
-     if ( anApp ) {
+     if ( anApp && anApp->objectBrowser() ) {
        myResult = anApp->objectBrowser()->treeView();
      }
    }
@@@ -1940,7 -1940,7 +1940,7 @@@ public
        myResult = (QAction*)module->createAction( myId, myTipText, icon, myMenuText, myStatusText, myKey, module, myToggle );
        }
        // for Python module, automatically connect action to callback slot
 -      PyModuleHelper* helper = qFindChild<PyModuleHelper*>( module, "python_module_helper" );
 +      PyModuleHelper* helper = module->findChild<PyModuleHelper*>( "python_module_helper" );
        if ( helper ) helper->connectAction( myResult );
      }
    }
@@@ -2561,7 -2561,7 +2561,7 @@@ public
            // specific processing for ParaView viewer:
            // hierarchy of ParaView viewer is much complex than for usual view;
            // we look for sub-widget named "Viewport"
 -          QList<QWidget*> lst = qFindChildren<QWidget*>( wnd, "Viewport" );
 +          QList<QWidget*> lst = wnd->findChildren<QWidget*>( "Viewport" );
            if ( !lst.isEmpty() ) {
              lst[0]->resize( myWndWidth, myWndHeight );
              myResult = true;
@@@ -2714,7 -2714,7 +2714,7 @@@ public
          QWidget* wnd = viewMgr->getActiveView();
          myResult = viewMgr->getActiveView()->getId();
          if ( wnd ) {
 -          wnd->setShown(myVisible);
 +          wnd->setVisible(myVisible);
            if ( !myVisible && myWidth == 0 && myHeight == 0 ) {
              myWidth = 1024;
              myHeight = 768;