From 27a802f1988cf228936596e42f968b5ce8b0f2ad Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 26 Nov 2012 16:56:52 +0100 Subject: 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 --- tests/auto/dumpcpp/dumpcpp.pro | 6 +++--- tests/auto/qaxobject/qaxobject.pro | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/auto/dumpcpp/dumpcpp.pro b/tests/auto/dumpcpp/dumpcpp.pro index 776aa32..aae7bd8 100644 --- a/tests/auto/dumpcpp/dumpcpp.pro +++ b/tests/auto/dumpcpp/dumpcpp.pro @@ -1,5 +1,5 @@ -CONFIG += testcase qaxcontainer -QT += widgets testlib +CONFIG += testcase +QT += widgets axcontainer testlib SOURCES += tst_dumpcpp.cpp TARGET = tst_dumpcpp @@ -8,4 +8,4 @@ TYPELIBS = $$(SystemRoot)\\system32\\ieframe.dll !exists($$TYPELIBS) { message("Web Browser type library for test not found!") -} \ No newline at end of file +} diff --git a/tests/auto/qaxobject/qaxobject.pro b/tests/auto/qaxobject/qaxobject.pro index 7e0fd69..e6f51a1 100644 --- a/tests/auto/qaxobject/qaxobject.pro +++ b/tests/auto/qaxobject/qaxobject.pro @@ -1,3 +1,3 @@ -CONFIG += testcase qaxcontainer -QT += testlib +CONFIG += testcase +QT += axcontainer testlib SOURCES += tst_qaxobject.cpp -- cgit v1.2.1