Improvement for remove dependence from Qt in install directory.

diff --git a/src/HTMLService/HTMLService.pro b/src/HTMLService/HTMLService.pro
index ea2dad205469af0963dd1684bf05c4a47a76bd59..2655ff5c7a210b920c008b4f6808ef34c5ff676f 100755 (executable)
--- a/src/HTMLService/HTMLService.pro
+++ b/src/HTMLService/HTMLService.pro
@@ -13,6 +13,8 @@ CAS_VIEWER = -L$(CASLIB) -lTKV3d -lTKService
 
 INCLUDEPATH += ../../include  $${CAS_CPPFLAGS}
 LIBS += -L../../$(CONFIG_ID)/lib $${CAS_KERNEL} $${CAS_VIEWER}
+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/LogWindow/LogWindow.pro b/src/LogWindow/LogWindow.pro
index 121b5e8b288edbf7b95afc7de0457080b56e9eb7..653c56df19c8ff4935cbda80dce519e406dbd2c0 100644 (file)
--- a/src/LogWindow/LogWindow.pro
+++ b/src/LogWindow/LogWindow.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/OBJECT/OBJECT.pro b/src/OBJECT/OBJECT.pro
index 5400a4b8bb081ee9a3503c286b325adf395d9e33..7b8f30f2ab02cc7be45d2e04ef8b0e6a334d882a 100644 (file)
--- a/src/OBJECT/OBJECT.pro
+++ b/src/OBJECT/OBJECT.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
@@ -12,6 +14,8 @@ win32:CAS_LDPATH = -L$(CASLIB) -lTKernel -lTKMath -lTKV3d
 
 INCLUDEPATH += ../../include $${CAS_CPPFLAGS}
 LIBS += $${CAS_LDPATH}
+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/ObjBrowser/ObjBrowser.pro b/src/ObjBrowser/ObjBrowser.pro
index 0a11142b5110bbce052291c9117230173ef7f0e9..ff7dd2bd0ddd3fbd0047ccc1c3cdf0dcfdb31328 100644 (file)
--- a/src/ObjBrowser/ObjBrowser.pro
+++ b/src/ObjBrowser/ObjBrowser.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 ../Qtx
 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