From: vsr <vsr@opencascade.com>
Date: Thu, 15 Dec 2011 16:02:15 +0000 (+0000)
Subject: Merge from V6_4_BR 15/12/2011
X-Git-Tag: pxsxl1~25
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7e15cac8c82ab98124dba7bd5db00694d897dcf5;p=modules%2Fgui.git

Merge from V6_4_BR 15/12/2011
---

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 );