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 /examples | |
| parent | 6eddb4ccd969792d1beebe329f4ec6001dff933b (diff) | |
| download | qtactiveqt-27a802f1988cf228936596e42f968b5ce8b0f2ad.tar.gz | |
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 'examples')
| -rw-r--r-- | examples/activeqt/comapp/comapp.pro | 2 | ||||
| -rw-r--r-- | examples/activeqt/hierarchy/hierarchy.pro | 4 | ||||
| -rw-r--r-- | examples/activeqt/menus/menus.pro | 4 | ||||
| -rw-r--r-- | examples/activeqt/multiple/multiple.pro | 4 | ||||
| -rw-r--r-- | examples/activeqt/opengl/opengl.pro | 5 | ||||
| -rw-r--r-- | examples/activeqt/qutlook/qutlook.pro | 3 | ||||
| -rw-r--r-- | examples/activeqt/simple/simple.pro | 4 | ||||
| -rw-r--r-- | examples/activeqt/webbrowser/webbrowser.pro | 3 | ||||
| -rw-r--r-- | examples/activeqt/wrapper/wrapper.pro | 4 |
9 files changed, 15 insertions, 18 deletions
diff --git a/examples/activeqt/comapp/comapp.pro b/examples/activeqt/comapp/comapp.pro index 4d1cbd6..f82dcf6 100644 --- a/examples/activeqt/comapp/comapp.pro +++ b/examples/activeqt/comapp/comapp.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qaxserver +QT += axserver QT += widgets diff --git a/examples/activeqt/hierarchy/hierarchy.pro b/examples/activeqt/hierarchy/hierarchy.pro index 9d4c665..4429ef6 100644 --- a/examples/activeqt/hierarchy/hierarchy.pro +++ b/examples/activeqt/hierarchy/hierarchy.pro @@ -1,8 +1,8 @@ TEMPLATE = lib TARGET = hierarchyax -CONFIG += qt warn_off qaxserver dll -QT += widgets +CONFIG += qt warn_off dll +QT += widgets axserver SOURCES = objects.cpp main.cpp HEADERS = objects.h diff --git a/examples/activeqt/menus/menus.pro b/examples/activeqt/menus/menus.pro index 150c1ab..de41ac1 100644 --- a/examples/activeqt/menus/menus.pro +++ b/examples/activeqt/menus/menus.pro @@ -1,8 +1,8 @@ TEMPLATE = app TARGET = menusax -CONFIG += qt warn_off qaxserver -QT += widgets +CONFIG += qt warn_off +QT += widgets axserver SOURCES = main.cpp menus.cpp HEADERS = menus.h diff --git a/examples/activeqt/multiple/multiple.pro b/examples/activeqt/multiple/multiple.pro index 295376d..3dbf77e 100644 --- a/examples/activeqt/multiple/multiple.pro +++ b/examples/activeqt/multiple/multiple.pro @@ -1,8 +1,8 @@ TEMPLATE = lib TARGET = multipleax -CONFIG += qt warn_off qaxserver dll -QT += widgets +CONFIG += qt warn_off dll +QT += widgets axserver SOURCES = main.cpp HEADERS = ax1.h ax2.h diff --git a/examples/activeqt/opengl/opengl.pro b/examples/activeqt/opengl/opengl.pro index 6c1360a..283a6e1 100644 --- a/examples/activeqt/opengl/opengl.pro +++ b/examples/activeqt/opengl/opengl.pro @@ -1,9 +1,8 @@ TEMPLATE = app TARGET = openglax -CONFIG += qt warn_off qaxserver - -QT += widgets opengl +CONFIG += qt warn_off +QT += widgets axserver opengl HEADERS = glbox.h \ globjwin.h diff --git a/examples/activeqt/qutlook/qutlook.pro b/examples/activeqt/qutlook/qutlook.pro index 4e0e027..484107d 100644 --- a/examples/activeqt/qutlook/qutlook.pro +++ b/examples/activeqt/qutlook/qutlook.pro @@ -1,8 +1,7 @@ #! [0] #! [1] TEMPLATE = app TARGET = qutlook -CONFIG += qaxcontainer -QT += widgets +QT += widgets axcontainer TYPELIBS = $$system(dumpcpp -getfile {00062FFF-0000-0000-C000-000000000046}) #! [0] diff --git a/examples/activeqt/simple/simple.pro b/examples/activeqt/simple/simple.pro index 297d8e0..31231d6 100644 --- a/examples/activeqt/simple/simple.pro +++ b/examples/activeqt/simple/simple.pro @@ -1,8 +1,8 @@ TEMPLATE = app TARGET = simpleax -CONFIG += qt warn_off qaxserver -QT += widgets +CONFIG += qt warn_off +QT += widgets axserver SOURCES = main.cpp RC_FILE = simple.rc diff --git a/examples/activeqt/webbrowser/webbrowser.pro b/examples/activeqt/webbrowser/webbrowser.pro index 915c7ca..8b29560 100644 --- a/examples/activeqt/webbrowser/webbrowser.pro +++ b/examples/activeqt/webbrowser/webbrowser.pro @@ -1,7 +1,6 @@ TEMPLATE = app -CONFIG += qaxcontainer -QT += widgets +QT += widgets axcontainer HEADERS = webaxwidget.h SOURCES = main.cpp diff --git a/examples/activeqt/wrapper/wrapper.pro b/examples/activeqt/wrapper/wrapper.pro index 1d2c3ae..b07e8f3 100644 --- a/examples/activeqt/wrapper/wrapper.pro +++ b/examples/activeqt/wrapper/wrapper.pro @@ -1,8 +1,8 @@ TEMPLATE = lib TARGET = wrapperax -CONFIG += qt warn_off qaxserver dll -QT += widgets +CONFIG += qt warn_off dll +QT += widgets axserver SOURCES = main.cpp RC_FILE = wrapperax.rc |