From 4e76e4f29868f0c33b06447ca6022cc9143b260d Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Thu, 27 Oct 2011 15:32:49 +0000
Subject: [PATCH] Merge from V6_3_BR branch (Windows porting) 27/10/2011

---
 adm_local/cmake_files/FindSIPPYQT.cmake | 3 +++
 src/LightApp/LightApp_Application.cxx   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/adm_local/cmake_files/FindSIPPYQT.cmake b/adm_local/cmake_files/FindSIPPYQT.cmake
index a8c397c80..2145885ee 100644
--- 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 4edd203cd..626039899 100644
--- 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()
-- 
2.39.2