Fix bug PAL10043

diff --git a/src/SALOMEGUI/QAD_Desktop.cxx b/src/SALOMEGUI/QAD_Desktop.cxx
index 0397011fa0ff41d5bfe861f936ac5780f5747937..4b3203183757712f6259ef35ee46fab128c7fb80 100644 (file)
--- a/src/SALOMEGUI/QAD_Desktop.cxx
+++ b/src/SALOMEGUI/QAD_Desktop.cxx
@@ -3353,7 +3353,7 @@ SALOMEGUI* QAD_Desktop::getComponentGUI( const QString& component )
 #ifdef WNT
        dir = dir + "libSalomePyQtcmodule.dll" ;
 #else
-#ifdef SIP_VERS_v4
+#if defined(SIP_VERS_v4_old) || defined(SIP_VERS_v4_new)
        dir = dir + "SalomePyQt.so" ;
 #else
        dir = dir + "libSalomePyQtcmodule.so" ;

diff --git a/src/SALOME_PYQT/Makefile.in b/src/SALOME_PYQT/Makefile.in
index 1eae930bdbfcdbc3547107c7719efb323df2b92c..74bbf6d53100187452967b11e50cca3ca51250dd 100644 (file)
--- a/src/SALOME_PYQT/Makefile.in
+++ b/src/SALOME_PYQT/Makefile.in
@@ -24,20 +24,24 @@ QT_VERS = Qt_3_3_0
 endif
 
 # Sip flags
-SIP_FLAGS = -t WS_X11 -t $(QT_VERS) -s ".cc" -c . -I $(PYQT_SIPS)
+SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
 # Sip common sources
 SIP_SRC = sipSalomePyQtSalomePyQt.cc \
          sipSalomePyQtSALOME_Selection.cc
 
 # Sip version-specific sources
-ifeq ($(SIP_VERS),v4)
+ifeq ($(SIP_VERS),v4_old)
+SIP_SRC  += sipSalomePyQtcmodule.cc
+else
+ifeq ($(SIP_VERS),v4_new)
 SIP_SRC  += sipSalomePyQtcmodule.cc
 else
 SIP_SRC  += SalomePyQtcmodule.cc
 endif
+endif
 
 # Sip/moc sources
-ifeq ($(SIP_VERS),v4)
+ifeq ($(SIP_VERS),v4_old)
 MOC_SRC   = sipSalomePyQtcmodule_moc.cxx
 MOC_H     = sipSalomePyQtcmodule.h
 else 
@@ -45,30 +49,45 @@ ifeq ($(SIP_VERS),v3_new)
 MOC_SRC   = SalomePyQtcmodule_moc.cxx
 MOC_H     = SalomePyQtcmodule.h
 else
+ifeq ($(SIP_VERS),v3_old)
 MOC_SRC   = sipSalomePyQtProxySalomePyQt_moc.cxx
 MOC_H     = sipSalomePyQtProxySalomePyQt.h
 endif
 endif
+endif
 
 # Sip definition files
-ifeq ($(SIP_VERS),v4)
+ifeq ($(SIP_VERS),v4_old)
+SIP_FILES = SalomePyQt_v4.sip
+else
+ifeq ($(SIP_VERS),v4_new)
 SIP_FILES = SalomePyQt_v4.sip
 else
 SIP_FILES = SalomePyQt.sip
 endif 
+endif 
 
 # Libraries targets
-ifeq ($(SIP_VERS),v4)
+ifeq ($(SIP_VERS),v4_old)
+LIB = SalomePyQt.so
+LDFLAGS+=-shared -lSalomeGUI
+else
+ifeq ($(SIP_VERS),v4_new)
 LIB = SalomePyQt.so
 LDFLAGS+=-shared -lSalomeGUI
 else
 LIB = libSalomePyQtcmodule.la
 LDFLAGS+=-lSalomeGUI -lqtcmodule
 endif 
+endif 
 
 # Exported python scripts
-ifneq ($(SIP_VERS),v4)
+ifeq ($(SIP_VERS),v3_old)
 EXPORT_SHAREDPYSCRIPTS = SalomePyQt.py
+else
+ifeq ($(SIP_VERS),v3_new)
+EXPORT_SHAREDPYSCRIPTS = SalomePyQt.py
+endif
 endif
 
 # Library sources

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI.cxx
index 555a68334fc6d14cc624d7d714f67f09b0621d4b..620ec89b615144f01fa8015e3fde94cdc208cdac 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI.cxx
@@ -16,6 +16,7 @@
 #include "SALOMEGUI_QtCatchCorbaException.hxx"
 #include "utilities.h"
 
+#include "SALOME_PYQT_SipDefs.h"
 #if defined(SIP_VERS_v4_old) || defined(SIP_VERS_v4_new)
 #include <sipAPISalomePyQt.h>
 #else