Improvement for remove dependence from Qt in install directory.

diff --git a/src/Plot2d/Plot2d.pro b/src/Plot2d/Plot2d.pro
index 8ff602108f4d015298983800d847b2755eed1028..976b8d7c13e1eed981115a969994ffb06a2b47ee 100644 (file)
--- a/src/Plot2d/Plot2d.pro
+++ b/src/Plot2d/Plot2d.pro
@@ -1,6 +1,8 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
@@ -10,6 +12,8 @@ INCLUDEPATH += ../Qtx ../SUIT
 unix:LIBS  += -L$$(QWTLIB) -lqwt
 win32:LIBS += /LIBPATH:$$(QWTLIB) -lqwt5
 LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/Prs/Prs.pro b/src/Prs/Prs.pro
index e853290cb59be96b3317f1d22dc7656ae2435ff5..b4fe7e1fcbe6f905b17f812235db48d704b7d1b6 100644 (file)
--- a/src/Prs/Prs.pro
+++ b/src/Prs/Prs.pro
@@ -1,10 +1,15 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
+
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared
 

diff --git a/src/PyConsole/PyConsole.pro b/src/PyConsole/PyConsole.pro
index a63deb48be84ab55858ee7bc1b5765f0d6cfe231..04e08a5e902eeea75dea25496bc37916b7cff8bc 100644 (file)
--- a/src/PyConsole/PyConsole.pro
+++ b/src/PyConsole/PyConsole.pro
@@ -1,6 +1,8 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
@@ -8,6 +10,8 @@ OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 INCLUDEPATH += ../../include $$(PYTHONINC)
 unix:LIBS  += -L../../$(CONFIG_ID)/lib -L$$(PYTHONLIB) -lpython2.5 -lSUIT -lPyInterp
 win32:LIBS  += -L../../$(CONFIG_ID)/lib -L$$(PYTHONLIB) -lpython25_d -lSUIT -lPyInterp -lQtx
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/PyInterp/PyInterp.pro b/src/PyInterp/PyInterp.pro
index 9913c9348685e2170c257ad0827105e533eecf32..bc1afac7995890e226be70382ae08337e82462fe 100644 (file)
--- a/src/PyInterp/PyInterp.pro
+++ b/src/PyInterp/PyInterp.pro
@@ -1,6 +1,8 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
@@ -8,6 +10,8 @@ OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 INCLUDEPATH += ../../include $$(PYTHONINC)
 unix:LIBS  += -L$$(PYTHONLIB) -lpython2.5
 win32:LIBS  += -L$$(PYTHONLIB) -lpython25_d
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/Qtx/Qtx.pro b/src/Qtx/Qtx.pro
index f676fff3fba931b63ca9de74be13bde59473bfec..f0dcfcb17500c57b7a95b8cf499e22e098fc1190 100644 (file)
--- a/src/Qtx/Qtx.pro
+++ b/src/Qtx/Qtx.pro
@@ -3,10 +3,15 @@ unix:TEMPLATE = lib
 
 CONFIG += embed_manifest_exe
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
+
 QT += xml
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/STD/STD.pro b/src/STD/STD.pro
index 8bc7c46b12951048505e8c04b37954ba65bb9e20..06b048327c8369aeea317c44a38ae74ca258edea 100644 (file)
--- a/src/STD/STD.pro
+++ b/src/STD/STD.pro
@@ -1,12 +1,16 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH = ../../include
 LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/SUIT/SUIT.pro b/src/SUIT/SUIT.pro
index a2308c0cbd5af28e52470b7e50fee08fb30748df..61c6078e66c97d3017a5cd9d2df9b0f8909309e8 100644 (file)
--- a/src/SUIT/SUIT.pro
+++ b/src/SUIT/SUIT.pro
@@ -1,12 +1,16 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH = ../../include
 LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lObjBrowser
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/SUITApp/SUITApp.pro b/src/SUITApp/SUITApp.pro
index c695d53263f28cc4e7c09b53743c1a13de95edaa..e5edddab52ff1e310f6f5ba8958b2f640775394a 100644 (file)
--- a/src/SUITApp/SUITApp.pro
+++ b/src/SUITApp/SUITApp.pro
@@ -3,12 +3,16 @@ win32:TEMPLATE = vcapp
 
 CONFIG -= embed_manifest_exe
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR = ../../$(CONFIG_ID)/bin
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH = ../../include
 LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx -lStyle -lObjBrowser
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/SVTK/SVTK.pro b/src/SVTK/SVTK.pro
index 0e1c3283204d588ed14972ba781446232d68f052..b51c7481e85b602e88bfb227319df59c428c83bf 100644 (file)
--- a/src/SVTK/SVTK.pro
+++ b/src/SVTK/SVTK.pro
@@ -1,6 +1,8 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
@@ -16,6 +18,8 @@ win32:OCC_LIBS = -L$(CASLIB) -lTKernel
 INCLUDEPATH += ../../include $${CAS_CPPFLAGS} $$(VTKINC) $$(BOOSTINC) ../Qtx ../SUIT ../OBJECT ../Prs ../VTKViewer
 LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT -lOBJECT -lPrs -lVTKViewer $${OCC_LIBS} $${VTK_LIBS}
 win32: LIBS += -lTKernel
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/Style/Style.pro b/src/Style/Style.pro
index a9523ce8ff2719203fe398e76c8007bde9d445bf..6464ee83ef72940fe7e36cd988a7f866df48795a 100644 (file)
--- a/src/Style/Style.pro
+++ b/src/Style/Style.pro
@@ -1,12 +1,16 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR =  ../../$(CONFIG_ID)/lib
 MOC_DIR =  ../../moc
 OBJECTS_DIR =  ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH =  ../../include
 LIBS += -L../../$(CONFIG_ID)/lib -lQtx
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/TableViewer/TableViewer.pro b/src/TableViewer/TableViewer.pro
index 4e612cfae61c54afd90cffb163e6aa7e33dee190..8c0d63320729ca0a2d8693bf4bc884e37b0f9853 100644 (file)
--- a/src/TableViewer/TableViewer.pro
+++ b/src/TableViewer/TableViewer.pro
@@ -1,6 +1,8 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
@@ -10,6 +12,8 @@ CAS_KERNEL = -L$(CASLIB) -lTKernel
 
 INCLUDEPATH = ../../include  $${CAS_CPPFLAGS}
 LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT $${CAS_KERNEL} -lHTMLService
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/VTKViewer/VTKViewer.pro b/src/VTKViewer/VTKViewer.pro
index 529e28077b95ae9d30e93cb7a7c9474080ee49a0..1a8b2bab8dd9b683ec06671866f12198e5f08fa6 100644 (file)
--- a/src/VTKViewer/VTKViewer.pro
+++ b/src/VTKViewer/VTKViewer.pro
@@ -1,6 +1,8 @@
 unix:TEMPLATE = lib
 win32:TEMPLATE = vclib
 
+win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe
+
 DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
@@ -14,6 +16,8 @@ CAS_KERNEL = -L$(CASLIB) -lTKernel
 
 INCLUDEPATH += ../../include $$(VTKINC) $${CAS_CPPFLAGS} ../Qtx ../SUIT
 LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT $${VTK_LIBS} $${CAS_KERNEL}
+win32:LIBS *= -L$(QTLIB)
+win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared