From 62f19a55810205034fba70e9ddd27bf641142f6d Mon Sep 17 00:00:00 2001 From: nds Date: Tue, 10 Jun 2008 04:31:34 +0000 Subject: [PATCH] Improvement for remove dependence from Qt in install directory. --- src/HTMLService/HTMLService.pro | 2 ++ src/LogWindow/LogWindow.pro | 4 ++++ src/OBJECT/OBJECT.pro | 4 ++++ src/ObjBrowser/ObjBrowser.pro | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/src/HTMLService/HTMLService.pro b/src/HTMLService/HTMLService.pro index ea2dad205..2655ff5c7 100755 --- 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 121b5e8b2..653c56df1 100644 --- 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 5400a4b8b..7b8f30f2a 100644 --- 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 0a11142b5..ff7dd2bd0 100644 --- 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 -- 2.39.2