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>
---
 examples/activeqt/mediaplayer/mediaaxwidget.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples')

diff --git a/examples/activeqt/mediaplayer/mediaaxwidget.h b/examples/activeqt/mediaplayer/mediaaxwidget.h
index a6da749..9eedb0a 100644
--- a/examples/activeqt/mediaplayer/mediaaxwidget.h
+++ b/examples/activeqt/mediaplayer/mediaaxwidget.h
@@ -51,7 +51,7 @@
 #ifndef MEDIAAXWIDGET_H
 #define MEDIAAXWIDGET_H
 
-#include <ActiveQt/QAxWidget>
+#include <QtAxContainer/QAxWidget>
 #include <qt_windows.h>
 
 // Overrides the translateKeyEvent() function to pass keystrokes
-- 
cgit v1.2.3