From 4ed1e56350c8c75a5dcb203fae633c6be7e02f52 Mon Sep 17 00:00:00 2001 From: axis Date: Thu, 27 Jan 2011 09:34:10 +0100 Subject: [PATCH] Changed various path references in ActiveQt to match modularization. --- qtactiveqt/src/activeqt/container/container.pro | 6 ++++-- qtactiveqt/src/activeqt/control/control.pro | 6 ++++-- qtactiveqt/tools/testcon/testcon.pro | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/qtactiveqt/src/activeqt/container/container.pro b/qtactiveqt/src/activeqt/container/container.pro index 4c9b3a8..57845b0 100644 --- a/qtactiveqt/src/activeqt/container/container.pro +++ b/qtactiveqt/src/activeqt/container/container.pro @@ -4,7 +4,7 @@ TARGET = ActiveQt CONFIG += qt_install_headers SYNCQT.HEADER_FILES = qaxbase.h qaxobject.h qaxscript.h qaxselect.h qaxwidget.h SYNCQT.HEADER_CLASSES = ../../../include/ActiveQt/QAxBase ../../../include/ActiveQt/QAxObject ../../../include/ActiveQt/QAxScriptEngine ../../../include/ActiveQt/QAxScript ../../../include/ActiveQt/QAxScriptManager ../../../include/ActiveQt/QAxSelect ../../../include/ActiveQt/QAxWidget -include(../../qt_install.pri) +include($$QT_SOURCE_TREE/src/qt_install.pri) TARGET = QAxContainer @@ -14,8 +14,10 @@ TARGET = QAxContainer } } +INCLUDEPATH *= $$QT.activeqt.includes + CONFIG += qt warn_on staticlib -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/lib +DESTDIR = $$QT.activeqt.libs LIBS += -lole32 -loleaut32 !wince*:LIBS += -luser32 -lgdi32 -ladvapi32 diff --git a/qtactiveqt/src/activeqt/control/control.pro b/qtactiveqt/src/activeqt/control/control.pro index 361ca29..3f7af07a 100644 --- a/qtactiveqt/src/activeqt/control/control.pro +++ b/qtactiveqt/src/activeqt/control/control.pro @@ -4,7 +4,7 @@ TARGET = ActiveQt CONFIG += qt_install_headers SYNCQT.HEADER_FILES = qaxaggregated.h qaxbindable.h qaxfactory.h SYNCQT.HEADER_CLASSES = ../../../include/ActiveQt/QAxAggregated ../../../include/ActiveQt/QAxBindable ../../../include/ActiveQt/QAxFactory ../../../include/ActiveQt/QAxClass -include(../../qt_install.pri) +include($$QT_SOURCE_TREE/src/qt_install.pri) TARGET = QAxServer @@ -14,8 +14,10 @@ TARGET = QAxServer } } +INCLUDEPATH *= $$QT.activeqt.includes + CONFIG += qt warn_off staticlib -QTDIR_build:DESTDIR = $$QT_BUILD_TREE\\lib +DESTDIR = $$QT.activeqt.libs DEFINES += QAX_SERVER win32-g++*:DEFINES += QT_NEEDS_QMAIN diff --git a/qtactiveqt/tools/testcon/testcon.pro b/qtactiveqt/tools/testcon/testcon.pro index 89f8067..07df464 100644 --- a/qtactiveqt/tools/testcon/testcon.pro +++ b/qtactiveqt/tools/testcon/testcon.pro @@ -14,8 +14,8 @@ FORMS = mainwindow.ui invokemethod.ui changeproperties.ui ambientproperties.ui RC_FILE = testcon.rc win32-borland { - QMAKE_POST_LINK = -midl $$QT_SOURCE_TREE/tools/activeqt/testcon/testcon.idl + QMAKE_POST_LINK = -midl $$QT.activeqt.sources/../../tools/testcon/testcon.idl } else { - !win32-g++*:QMAKE_POST_LINK = midl $$QT_SOURCE_TREE/tools/activeqt/testcon/testcon.idl && move testcon.tlb $(TARGETDIR) + !win32-g++*:QMAKE_POST_LINK = midl $$QT.activeqt.sources/../../tools/testcon/testcon.idl && move testcon.tlb $(TARGETDIR) } -- 1.7.3.4