diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-30 09:39:26 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-06 13:57:14 +0200 |
| commit | a8284209f33eee8a5ecdbb2cce7798e689bc8b5d (patch) | |
| tree | 8825fcf628b15de088676079ab8aed400a03ea3a /tests/manual | |
| parent | 7a6472a6d6c600698858de59e3f1dd1424ca32dd (diff) | |
Restructure the libraries
Establish QtAxContainer and QtAxServer as proper modules.
Add QtAxBase as a static helper lib containing
qaxtypefunctions.cpp and qaxutils.cpp from the shared
directory.
qaxtypes.cpp remains in the shared directory as it is
used by both modules with differing defines. The VARIANT
<-> QVariant conversion is exposed via QAxBasePrivate
for testcon.
Add activeqt as a header-only module modeled after
platformheaders.
This makes it easier for the cmake conversion tools.
Task-number: QTBUG-78167
Task-number: QTBUG-27776
Change-Id: I3e7956ea91f2177b8c2596402908351b4d99c510
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/axviewer/main.cpp | 4 | ||||
| -rw-r--r-- | tests/manual/testcontrol/main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/manual/axviewer/main.cpp b/tests/manual/axviewer/main.cpp index 435037b..29ad3dc 100644 --- a/tests/manual/axviewer/main.cpp +++ b/tests/manual/axviewer/main.cpp @@ -29,8 +29,8 @@ #include "metaobjectdump.h" #include "textdialog.h" -#include <ActiveQt/QAxSelect> -#include <ActiveQt/QAxWidget> +#include <QtAxContainer/QAxSelect> +#include <QtAxContainer/QAxWidget> #include <QtGui/QAction> #include <QtWidgets/QApplication> diff --git a/tests/manual/testcontrol/main.cpp b/tests/manual/testcontrol/main.cpp index 46dfa6b..bedd265 100644 --- a/tests/manual/testcontrol/main.cpp +++ b/tests/manual/testcontrol/main.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <ActiveQt/QAxFactory> +#include <QtAxServer/QAxFactory> #include <QtGui/QAction> #include <QtWidgets/QApplication> #include <QtWidgets/QMainWindow> |