From 994943a86fff51d1794cdb89645919a656dca2a2 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 15 Dec 2011 15:38:36 +0000 Subject: [PATCH] Merge from V6_4_0_WIN_BR 15/12/2011 (problem with WebKit-based doc viewer on Win32) --- src/LightApp/LightApp_Application.cxx | 4 ++-- src/Qtx/QtxWebBrowser.cxx | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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 ); -- 2.39.2