Attachment #137336 for bug #155974

View | Details | Raw Unified | Return to bug 155974 | Differences between

and this patch

Lines 50-55 Link Here

(-)src3.2.6_orig/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4 (+4 lines)
50	SIP_VERS=v4_new ;;	50	SIP_VERS=v4_new ;;
51	4.5*)	51	4.5*)
52	SIP_VERS=v4_new ;;	52	SIP_VERS=v4_new ;;
		53	4.6*)
		54	SIP_VERS=v4_new ;;
		55	4.7*)
		56	SIP_VERS=v4_new ;;
53	*)	57	*)
54	AC_MSG_RESULT(sip version $version not supported)	58	AC_MSG_RESULT(sip version $version not supported)
55	SIP_VERS=unsupported ;;	59	SIP_VERS=unsupported ;;

Lines 41-46 Link Here

(-)src3.2.6_orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in (+3 lines)
41	ifeq ($(QT_VERS),Qt_3_3_7)	41	ifeq ($(QT_VERS),Qt_3_3_7)
42	QT_VERS = Qt_3_3_0	42	QT_VERS = Qt_3_3_0
43	endif	43	endif
		44	ifeq ($(QT_VERS),Qt_3_3_8)
		45	QT_VERS = Qt_3_3_0
		46	endif
44		47
45	# Sip flags	48	# Sip flags
46	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)	49	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)

Lines 44-49 Link Here

(-)src3.2.6_orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in (+4 lines)
44	QT_VERS = Qt_3_3_0	44	QT_VERS = Qt_3_3_0
45	endif	45	endif
46		46
		47	ifeq ($(QT_VERS),Qt_3_3_8)
		48	QT_VERS = Qt_3_3_0
		49	endif
		50
47	# Sip flags	51	# Sip flags
48	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)	52	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
49		53

Return to bug 155974