Merge from V6_4_0_WIN_BR 15/12/2011 (problem with WebKit-based doc viewer on Win32)

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 394546a01606733308a742839f90d5858a5b9810..ff50cfaf8183daf83a3eff12d13c04dd84500655 100644 (file)
--- 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 f88be64b58ae4f92ec7b01636ef1ed365553679b..0b8801160b66792ddd44a008c3667f20e6c2357b 100644 (file)
--- 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 );