diff options
-rw-r--r-- | src/activeqt/activeqt.pro | 14 | ||||
-rw-r--r-- | src/activeqt/container/container.pro | 11 | ||||
-rw-r--r-- | src/activeqt/control/control.pro | 14 | ||||
-rw-r--r-- | sync.profile | 6 |
4 files changed, 19 insertions, 26 deletions
diff --git a/src/activeqt/activeqt.pro b/src/activeqt/activeqt.pro index e849d3d..a529654 100644 --- a/src/activeqt/activeqt.pro +++ b/src/activeqt/activeqt.pro @@ -1,7 +1,17 @@ TEMPLATE = subdirs CONFIG += ordered -CONFIG += module SUBDIRS = container -MODULE_PRI = ../../modules/qt_activeqt.pri !wince*: SUBDIRS += control + +TARGET = ActiveQt +MODULE = activeqt +MODULE_DEPENDS = widgets +MODULE_PRI = $$section(PWD, /, 0, -3)/modules/qt_activeqt.pri +MODULE_BASE_DIR = $$section(PWD, /, 0, -3) +MODULE_BASE_OUTDIR = $$section(OUT_PWD, /, 0, -3) +MODULE_PROFILE_DIR = $$MODULE_BASE_DIR +MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR +load(qt_module_fwdpri) +load(qt_module_headers) +load(qt_installs) diff --git a/src/activeqt/container/container.pro b/src/activeqt/container/container.pro index a927d86..548f97b 100644 --- a/src/activeqt/container/container.pro +++ b/src/activeqt/container/container.pro @@ -1,13 +1,6 @@ TEMPLATE = lib - -TARGET = ActiveQt -CONFIG += create_prl 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 -load(qt_installs) - TARGET = QAxContainer +CONFIG += create_prl !debug_and_release|build_pass { CONFIG(debug, debug|release) { @@ -46,3 +39,5 @@ SOURCES = qaxbase.cpp \ ../shared/qaxutils.cpp FORMS = qaxselect.ui + +load(qt_installs) diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro index ef8b709..f493589 100644 --- a/src/activeqt/control/control.pro +++ b/src/activeqt/control/control.pro @@ -1,14 +1,6 @@ TEMPLATE = lib - -TARGET = ActiveQt -CONFIG += create_prl qt_install_headers -QT += widgets - -SYNCQT.HEADER_FILES = qaxaggregated.h qaxbindable.h qaxfactory.h -SYNCQT.HEADER_CLASSES = ../../../include/ActiveQt/QAxAggregated ../../../include/ActiveQt/QAxBindable ../../../include/ActiveQt/QAxFactory ../../../include/ActiveQt/QAxClass -load(qt_installs) - TARGET = QAxServer +CONFIG += create_prl !debug_and_release|build_pass { CONFIG(debug, debug|release) { @@ -18,7 +10,7 @@ TARGET = QAxServer INCLUDEPATH *= $$QT.activeqt.includes -QT += core-private gui-private +QT += core-private gui-private widgets CONFIG += qt warn_off staticlib DESTDIR = $$QT.activeqt.libs @@ -44,3 +36,5 @@ SOURCES = qaxserver.cpp \ qaxmain.cpp \ ../shared/qaxtypes.cpp \ ../shared/qaxutils.cpp + +load(qt_installs) diff --git a/sync.profile b/sync.profile index 83d91fc..defa576 100644 --- a/sync.profile +++ b/sync.profile @@ -5,12 +5,6 @@ ); %classnames = ( ); -%mastercontent = ( - "gui" => "#include <QtGui/QtGui>\n", -); -%modulepris = ( - "ActiveQt" => "$basedir/modules/qt_activeqt.pri", -); # Module dependencies. # Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: |