From a8284209f33eee8a5ecdbb2cce7798e689bc8b5d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 30 Apr 2020 09:39:26 +0200
Subject: 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>
---
 tests/manual/axviewer/main.cpp    | 4 ++--
 tests/manual/testcontrol/main.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/manual')

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>
-- 
cgit v1.2.3