From: vsr <vsr@opencascade.com>
Date: Thu, 15 Dec 2011 15:54:56 +0000 (+0000)
Subject: Additional merge from V6_4_0_BR
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=52078e1f84fae52323a03e00f709abd72b9fe536;p=modules%2Fgui.git

Additional merge from V6_4_0_BR
---

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 394546a01..ff50cfaf8 100644
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -1004,7 +1004,7 @@ void LightApp_Application::onHelpContentsModule()
     }
   }
   else {
-    QtxWebBrowser::loadUrl(getFile() + helpFile);
+    QtxWebBrowser::loadUrl(helpFile);
   }
 }
 
@@ -1071,7 +1071,7 @@ void LightApp_Application::onHelpContextModule( const QString& theComponentName,
     }
   }
   else {
-    QtxWebBrowser::loadUrl(getFile() + helpFile, context );
+    QtxWebBrowser::loadUrl(helpFile, context);
   }
 }
 
diff --git a/src/Qtx/QtxWebBrowser.cxx b/src/Qtx/QtxWebBrowser.cxx
index f88be64b5..0b8801160 100644
--- a/src/Qtx/QtxWebBrowser.cxx
+++ b/src/Qtx/QtxWebBrowser.cxx
@@ -218,6 +218,7 @@ void QtxWebBrowser::loadUrl( const QString& url, const QString& anchor )
 {
   QString anUrl = url;
   if( !anchor.isEmpty() ) anUrl += "#" + anchor;
+  anUrl.replace('\\', '/');
 
   Qtx::alignWidget( webBrowser(), (QWidget*)QApplication::desktop(), Qtx::AlignCenter );