Run SALOME with UNICODE path: finishing.

diff --git a/src/HelpBrowser/CMakeLists.txt b/src/HelpBrowser/CMakeLists.txt
index 4eaa40ccfb9287ada6f7b7caa111fbddfa88864a..ee2a2a7a36203cca93d9e09ec81b1a5d978d8a04 100644 (file)
--- a/src/HelpBrowser/CMakeLists.txt
+++ b/src/HelpBrowser/CMakeLists.txt
@@ -79,3 +79,4 @@ SET(HelpBrowser_SOURCES
 ADD_EXECUTABLE(HelpBrowser ${HelpBrowser_SOURCES})
 TARGET_LINK_LIBRARIES(HelpBrowser ${_link_LIBRARIES})
 INSTALL(TARGETS HelpBrowser EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
+INSTALL(FILES qt.conf DESTINATION ${SALOME_INSTALL_BINS})

diff --git a/src/HelpBrowser/HelpBrowser.cxx b/src/HelpBrowser/HelpBrowser.cxx
index 03cb8f5f3b9a88a75febf62fe76f39a0c02daf1e..9f461494242df06f6d6292a4c2c2f9994a642a3d 100644 (file)
--- a/src/HelpBrowser/HelpBrowser.cxx
+++ b/src/HelpBrowser/HelpBrowser.cxx
@@ -39,6 +39,11 @@
 
 #include <iostream>
 
+#ifdef WIN32
+#include <windows.h>
+#endif
+
+
 namespace
 {
   void printHelp()
@@ -151,6 +156,16 @@ int main( int argc, char **argv )
     }
   }
 
+#if defined(WIN32) && defined(UNICODE)                   
+  LPWSTR *szArglist = NULL;
+  int nArgs;
+  int i;
+  szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs);         
+  helpfile = QString::fromWCharArray(szArglist[nArgs-1]);
+  // Free memory allocated for CommandLineToArgvW arguments.
+  LocalFree(szArglist);
+#endif
+
   // Show help and exit if '--help' or '-h' option has been specified via command line
   if ( showHelp )
   {

diff --git a/src/HelpBrowser/HelpBrowser.qrc b/src/HelpBrowser/HelpBrowser.qrc
index 6fde5583534ddbb072fde5207ffeb2c42316fc91..d5aca33714eb94191792b5f44dfc0e563f94d9f2 100644 (file)
--- a/src/HelpBrowser/HelpBrowser.qrc
+++ b/src/HelpBrowser/HelpBrowser.qrc
@@ -1,6 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
   <file>COPYING</file>
-  <file alias="qt/etc/qt.conf">qt.conf</file>
 </qresource>
 </RCC>