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 /tools/testcon/mainwindow.h | |
| 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 'tools/testcon/mainwindow.h')
| -rw-r--r-- | tools/testcon/mainwindow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testcon/mainwindow.h b/tools/testcon/mainwindow.h index 8975201..5cc605a 100644 --- a/tools/testcon/mainwindow.h +++ b/tools/testcon/mainwindow.h @@ -29,7 +29,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <ActiveQt/QAxSelect> +#include <QtAxContainer/QAxSelect> #include <QVector> #include "ui_mainwindow.h" |