diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-11-26 16:56:52 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-28 08:56:19 +0100 |
| commit | 27a802f1988cf228936596e42f968b5ce8b0f2ad (patch) | |
| tree | 7d72a21d3d188fe6b691c1f9c1480b546dfdef73 /tools | |
| parent | 6eddb4ccd969792d1beebe329f4ec6001dff933b (diff) | |
fix activeqt module structure
The formerly monolithic ActiveQt module has been split into three
modules:
axserver
A static library for creating a server project.
axcontainer
A static libary for creating a container project.
axbase
A static library with shared code for the latter two libraries.
This module also is responsible for the installation of header
files in the include/ActiveQt directory.
"CONFIG += qaxserver" has been deprecated.
Use "QT += axserver" instead.
"CONFIG += qaxcontainer" has been deprecated.
Use "QT += axcontainer" instead.
Code from qaxtypes.cpp that does not depend on the QAX_SERVER define
has been moved to qaxtypefunctions.cpp and resides in the axbase
module.
Task-number: QTBUG-27776
Change-Id: Ib39fc897ccfce16849be0e3c084817d2cd0fc926
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dumpcpp/dumpcpp.pro | 3 | ||||
| -rw-r--r-- | tools/dumpdoc/dumpdoc.pro | 4 | ||||
| -rw-r--r-- | tools/testcon/testcon.pro | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/tools/dumpcpp/dumpcpp.pro b/tools/dumpcpp/dumpcpp.pro index 5c8f48d..3917298 100644 --- a/tools/dumpcpp/dumpcpp.pro +++ b/tools/dumpcpp/dumpcpp.pro @@ -1,5 +1,4 @@ -CONFIG += qaxcontainer -QT += widgets core-private +QT += axcontainer widgets core-private SOURCES = main.cpp diff --git a/tools/dumpdoc/dumpdoc.pro b/tools/dumpdoc/dumpdoc.pro index 5f3fb4e..9ebc782 100644 --- a/tools/dumpdoc/dumpdoc.pro +++ b/tools/dumpdoc/dumpdoc.pro @@ -1,7 +1,7 @@ TEMPLATE = app -CONFIG += console qaxcontainer -QT += widgets +CONFIG += console +QT += axcontainer widgets SOURCES += main.cpp diff --git a/tools/testcon/testcon.pro b/tools/testcon/testcon.pro index 5204af4..4c27638 100644 --- a/tools/testcon/testcon.pro +++ b/tools/testcon/testcon.pro @@ -1,7 +1,7 @@ TEMPLATE = app -CONFIG += qaxserver qaxserver_no_postlink qaxcontainer -QT += widgets printsupport +CONFIG += qaxserver_no_postlink +QT += widgets axserver axcontainer printsupport SOURCES = main.cpp docuwindow.cpp mainwindow.cpp invokemethod.cpp changeproperties.cpp ambientproperties.cpp controlinfo.cpp HEADERS = docuwindow.h mainwindow.h invokemethod.h changeproperties.h ambientproperties.h controlinfo.h |