Bug 18580

Fix for compilation with sip 4.7.3

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
index 048145b731a3a1ecdea62dce5bd06c211fa42c94..d7f8dc59c1d7a1314f3dc8ec3ca809c33b997942 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
@@ -45,8 +45,11 @@
 #endif
 #include "sipAPISalomePyQtGUI.h"
 
+#include <sip.h>
+#if SIP_VERSION < 0x040700
 #include "sipqtQWidget.h"
 #include "sipqtQPopupMenu.h"
+#endif
 
 #include <CORBA.h>
 

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip
index c550e24098967a14be5e8e206d9a90e2184af746..91419367b8993c6b7fb94f0238d5fe60477f0ebc 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip
@@ -11,6 +11,10 @@
 
 %Import qtmod.sip
 
+%ExportedHeaderCode
+#include <SalomePyQt.h>
+%End
+
 class SALOME_Selection : QObject
 {
 %TypeHeaderCode
@@ -29,6 +33,8 @@ signals:
   void currentSelectionChanged();
 };
 
+//%ExportedHeaderCode
+
 enum MenuName {
   File        = 1,
   View        = 2,
@@ -63,12 +69,13 @@ enum PrefType {
   PT_User
 };
 
+//%End
+
 class QtxAction : QAction
 {
 %TypeHeaderCode
 #include <QtxAction.h>
 %End
-
 private:
   QtxAction(const QtxAction &);
 };
@@ -169,3 +176,4 @@ public:
   static void              message( const QString&, bool = true ) /ReleaseGIL/ ;
   static void              clearMessages() /ReleaseGIL/ ;
 };
+