From: vsr <vsr@opencascade.com>
Date: Fri, 1 Jun 2007 13:47:33 +0000 (+0000)
Subject: Porting to Qt 4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f7cc09216f9a5e489fbfc032e43654975d5b8d11;p=modules%2Fgui.git

Porting to Qt 4
---

diff --git a/src/SOCC/SOCC.pro b/src/SOCC/SOCC.pro
index 44e49388f..488f9f37c 100644
--- 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 3fbf0d680..e85daf207 100755
--- 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 0e155b631..f1561b744 100644
--- 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