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 | |
| 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')
| -rw-r--r-- | tools/testcon/changeproperties.cpp | 2 | ||||
| -rw-r--r-- | tools/testcon/invokemethod.cpp | 4 | ||||
| -rw-r--r-- | tools/testcon/mainwindow.cpp | 8 | ||||
| -rw-r--r-- | tools/testcon/mainwindow.h | 2 | ||||
| -rw-r--r-- | tools/testcon/testcon.pro | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/tools/testcon/changeproperties.cpp b/tools/testcon/changeproperties.cpp index e3356ed..966b5f1 100644 --- a/tools/testcon/changeproperties.cpp +++ b/tools/testcon/changeproperties.cpp @@ -34,7 +34,7 @@ #include <QtCore/QMetaObject> #include <QtCore/QMetaProperty> #include <QtCore/QRegularExpression> -#include <ActiveQt/QAxWidget> +#include <QtAxContainer/QAxWidget> QT_BEGIN_NAMESPACE diff --git a/tools/testcon/invokemethod.cpp b/tools/testcon/invokemethod.cpp index 48dfabb..32021ea 100644 --- a/tools/testcon/invokemethod.cpp +++ b/tools/testcon/invokemethod.cpp @@ -29,8 +29,10 @@ #include "invokemethod.h" #include <qt_windows.h> -#include <ActiveQt/ActiveQt> +#include <QtAxContainer/QAxBase> #include <QtWidgets/QCompleter> +#include <QtCore/QMetaObject> +#include <QtCore/QMetaMethod> QT_BEGIN_NAMESPACE diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp index df69981..7bcc483 100644 --- a/tools/testcon/mainwindow.cpp +++ b/tools/testcon/mainwindow.cpp @@ -44,9 +44,9 @@ #include <QtCore/QDebug> #include <QtCore/QLibraryInfo> #include <QtCore/qt_windows.h> -#include <ActiveQt/QAxScriptManager> -#include <ActiveQt/QAxWidget> -#include <ActiveQt/qaxtypes.h> +#include <QtAxContainer/QAxScriptManager> +#include <QtAxContainer/QAxWidget> +#include <QtAxContainer/private/qaxbase_p.h> #include <memory> #include <sddl.h> @@ -584,7 +584,7 @@ void MainWindow::logSignal(const QString &signal, int argc, void *argv) auto params = static_cast<const VARIANT *>(argv); for (int a = argc-1; a >= 0; --a) { paramlist += QLatin1Char(' '); - paramlist += VARIANTToQVariant(params[a], nullptr).toString(); + paramlist += QAxBasePrivate::VARIANTToQVariant(params[a], nullptr).toString(); paramlist += a > 0 ? QLatin1Char(',') : QLatin1Char(' '); } if (argc) 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" diff --git a/tools/testcon/testcon.pro b/tools/testcon/testcon.pro index ead0055..f796ba9 100644 --- a/tools/testcon/testcon.pro +++ b/tools/testcon/testcon.pro @@ -1,7 +1,7 @@ TEMPLATE = app CONFIG += qaxserver_no_postlink -QT += widgets axserver axcontainer printsupport +QT += widgets axserver axcontainer axcontainer-private 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 |