Porting to Qt 4

diff --git a/src/SOCC/SOCC.pro b/src/SOCC/SOCC.pro
index 44e49388ff2cfe016f78d1d76d19397d788a70a3..488f9f37c35b683a2946923633c19c578ffbb539 100644 (file)
--- a/src/SOCC/SOCC.pro
+++ b/src/SOCC/SOCC.pro
@@ -10,7 +10,7 @@ CAS_CPPFLAGS = $${CASROOT}/inc
 BOOST_CPPFLAGS = $$(BOOSTDIR)/include
 
 INCLUDEPATH += ../../include $${CAS_CPPFLAGS} $${BOOST_CPPFLAGS} ../Qtx ../SUIT ../OBJECT ../Prs ../OCCViewer
-LIBS += -L../../lib -lsuit -lSalomeObject -lSalomePrs -lOCCViewer
+LIBS += -L../../lib -lqtx -lsuit -lSalomeObject -lSalomePrs -lOCCViewer
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/SVTK/Makefile.am b/src/SVTK/Makefile.am
index 3fbf0d6801d41310a5bfa42315b609f62a113ce6..e85daf20721d4269b38c960083bd0f220b3f778e 100755 (executable)
--- a/src/SVTK/Makefile.am
+++ b/src/SVTK/Makefile.am
@@ -109,8 +109,7 @@ libSVTK_la_CPPFLAGS= \
        $(CAS_CPPFLAGS) \
        $(VTK_INCLUDES) \
        $(BOOST_CPPFLAGS) \
-       -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../STD \
-       -I$(srcdir)/../CAM -I$(srcdir)/../OBJECT -I$(srcdir)/../Prs \
+       -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT -I$(srcdir)/../Prs \
        -I$(srcdir)/../VTKViewer
 
 libSVTK_la_LDFLAGS= \

diff --git a/src/SVTK/SVTK.pro b/src/SVTK/SVTK.pro
index 0e155b6312372c4335dc16d26806233977883048..f1561b744af352fc3f05a1b2515e28856fd33276 100644 (file)
--- a/src/SVTK/SVTK.pro
+++ b/src/SVTK/SVTK.pro
@@ -16,8 +16,8 @@ BOOST_CPPFLAGS = $$(BOOSTDIR)/include
 
 OCC_LIBS = 
 
-INCLUDEPATH += ../../include $${CAS_CPPFLAGS} $${VTK_INCLUDES} $${BOOST_CPPFLAGS} ../Qtx ../SUIT ../STD ../CAM ../OBJECT ../Prs ../VTKViewer
-LIBS += -L../../lib -lqtx -lsuit -lstd -lCAM -lSalomeObject -lSalomePrs -lVTKViewer $${OCC_LIBS} $${VTK_LIBS}
+INCLUDEPATH += ../../include $${CAS_CPPFLAGS} $${VTK_INCLUDES} $${BOOST_CPPFLAGS} ../Qtx ../SUIT ../OBJECT ../Prs ../VTKViewer
+LIBS += -L../../lib -lqtx -lsuit -lSalomeObject -lSalomePrs -lVTKViewer $${OCC_LIBS} $${VTK_LIBS}
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared