Merge from V6_3_BR branch (Windows porting) 27/10/2011

diff --git a/adm_local/cmake_files/FindSIPPYQT.cmake b/adm_local/cmake_files/FindSIPPYQT.cmake
index a8c397c80c691bb82d7db81a43527672fed09886..2145885eec732320cd7028415c5f63e45b7ef8c1 100644 (file)
--- a/adm_local/cmake_files/FindSIPPYQT.cmake
+++ b/adm_local/cmake_files/FindSIPPYQT.cmake
@@ -26,6 +26,9 @@ GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH)
 ENDIF(SIP_ROOT)
 
 SET(SIP_INCLUDES -I${SIP_ROOT}/include/python${PYTHON_VERSION})
+IF(WINDOWS)
+  SET(SIP_INCLUDES ${SIP_INCLUDES} -I${SIP_ROOT}/include)
+ENDIF(WINDOWS)
 
 IF(WINDOWS)
   FIND_PROGRAM(PYUIC_EXECUTABLE NAMES pyuic4 pyuic4.bat)

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 4edd203cd24bc810a2d7435572fe2c85b3aba236..62603989964f35cd489925ab1db3d98dec3605ec 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -931,11 +931,11 @@ public:
               const QString&        theContext = QString() )
     : myApp( theApp ),
       myParams( theParams ),
-      myHelpFile( getFile() + theHelpFile ),
       myContext( theContext ),
       myStatus(0),
       myLApp( app )
   {
+    myHelpFile = QString("%1%2").arg( getFile() ).arg( QFileInfo( theHelpFile ).canonicalFilePath() );
   }
 
   virtual void run()