From bb23d0ee42bc84d4c791047632e0940e776c921b Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 22 Aug 2005 06:58:12 +0000 Subject: [PATCH] Fix a bug of SALOME_PYQT package - to work properly with Sip and PyQt libraries additional SIP flags should be defined depending on existing Qt packages. --- adm_local/unix/make_commence.in | 1 + src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in | 2 +- src/SALOME_PYQT/SalomePyQt/Makefile.in | 3 +- src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip | 35 +------------------- src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip | 35 +------------------- 5 files changed, 6 insertions(+), 70 deletions(-) diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index a80d1cc3a..c5cec34a5 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -87,6 +87,7 @@ PYQT_SIPS = @PYQT_SIPS@ PYQT_LIBS = @PYQT_LIBS@ PYQT_INCLUDES = @PYQT_INCLUDES@ PYUIC = @PYUIC@ +PYQT_SIPFLAGS = @PYQT_SIPFLAGS@ # openGL OGL_INCLUDES=@OGL_INCLUDES@ diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in index ff3c60953..5cb5f7314 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in +++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in @@ -24,7 +24,7 @@ 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 sources ifeq ($(SIP_VERS),v4_old) diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.in b/src/SALOME_PYQT/SalomePyQt/Makefile.in index 9a55f6413..2724198f0 100644 --- a/src/SALOME_PYQT/SalomePyQt/Makefile.in +++ b/src/SALOME_PYQT/SalomePyQt/Makefile.in @@ -24,7 +24,8 @@ 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 \ diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip index 2490c3929..4e40c673a 100644 --- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip +++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip @@ -39,45 +39,12 @@ enum MenuName { Help = 7 }; -class QtxAction +class QtxAction : QAction { %TypeHeaderCode #include %End -public: - void setIconSet( const QIconSet& ); - QIconSet iconSet() const; - void setText( const QString& ); - QString text() const; - void setMenuText( const QString& ); - QString menuText() const; - void setToolTip( const QString& ); - QString toolTip() const; - void setStatusTip( const QString& ); - QString statusTip() const; - void setWhatsThis( const QString& ); - QString whatsThis() const; - void setAccel( const QKeySequence& ); - QKeySequence accel() const; - void setToggleAction( bool ); - bool isToggleAction() const; - bool isOn() const; - bool isEnabled() const; - bool isVisible() const; - -public slots: - void activate(); - void toggle(); - void setOn( bool ); - void setEnabled( bool ); - void setDisabled( bool ); - void setVisible( bool ); - -signals: - void activated(); - void toggled( bool ); - private: QtxAction(const QtxAction &); }; diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip index a7a43beaf..f5a4a993b 100644 --- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip +++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip @@ -39,45 +39,12 @@ enum MenuName { Help = 7 }; -class QtxAction +class QtxAction : QAction { %TypeHeaderCode #include %End -public: - void setIconSet( const QIconSet& ); - QIconSet iconSet() const; - void setText( const QString& ); - QString text() const; - void setMenuText( const QString& ); - QString menuText() const; - void setToolTip( const QString& ); - QString toolTip() const; - void setStatusTip( const QString& ); - QString statusTip() const; - void setWhatsThis( const QString& ); - QString whatsThis() const; - void setAccel( const QKeySequence& ); - QKeySequence accel() const; - void setToggleAction( bool ); - bool isToggleAction() const; - bool isOn() const; - bool isEnabled() const; - bool isVisible() const; - -public slots: - void activate(); - void toggle(); - void setOn( bool ); - void setEnabled( bool ); - void setDisabled( bool ); - void setVisible( bool ); - -signals: - void activated(); - void toggled( bool ); - private: QtxAction(const QtxAction &); }; -- 2.39.2