diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-11 05:52:09 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-11 08:38:46 +0000 |
| commit | af89fec03d0d3267876cae0201536ca7b8b4cc9f (patch) | |
| tree | 95dbfae64792610528910a9c66e68a3e5d829f76 | |
| parent | d4bc1ade3a8aae42915c1c71f4bac10414644ae0 (diff) | |
Add Active Qt
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: Ibb22408684b4d0ed944aef12f8265fc5b3463c32
Reviewed-by: Christian Tismer <tismer@stackless.com>
3 files changed, 8 insertions, 7 deletions
diff --git a/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt b/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt index 38e764405..8f8f5d4d1 100644 --- a/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt @@ -2,7 +2,10 @@ project(QtAxContainer) set(QtAxContainer_SRC ${QtAxContainer_GEN_DIR}/qaxbase_wrapper.cpp +${QtAxContainer_GEN_DIR}/qaxbaseobject_wrapper.cpp +${QtAxContainer_GEN_DIR}/qaxbasewidget_wrapper.cpp ${QtAxContainer_GEN_DIR}/qaxobject_wrapper.cpp +${QtAxContainer_GEN_DIR}/qaxobjectinterface_wrapper.cpp ${QtAxContainer_GEN_DIR}/qaxscript_wrapper.cpp ${QtAxContainer_GEN_DIR}/qaxscriptengine_wrapper.cpp ${QtAxContainer_GEN_DIR}/qaxscriptmanager_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtAxContainer/QtAxContainer_global.post.h.in b/sources/pyside2/PySide2/QtAxContainer/QtAxContainer_global.post.h.in index 22e1b0119..f4033c4f5 100644 --- a/sources/pyside2/PySide2/QtAxContainer/QtAxContainer_global.post.h.in +++ b/sources/pyside2/PySide2/QtAxContainer/QtAxContainer_global.post.h.in @@ -1,5 +1 @@ -#include <ActiveQt/QAxSelect> -#include <ActiveQt/QAxScript> -#include <ActiveQt/QAxScriptEngine> -#include <ActiveQt/QAxScriptManager> -#include <ActiveQt/QAxWidget> +#include <QtAxContainer/QtAxContainer> diff --git a/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml b/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml index 27746237a..a331b6988 100644 --- a/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml +++ b/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml @@ -46,10 +46,11 @@ <rejection class="*" function-name="queryInterface"/> <rejection class="*" function-name="qt_metacall"/> <rejection class="*" function-name="qt_static_metacall"/> - <rejection class="*" field-name="qt_meta_stringdata_QAxBase"/> - <rejection class="*" field-name="qt_meta_data_QAxBase"/> + <object-type name="QAxBase"/> + <object-type name="QAxBaseObject"/> <object-type name="QAxObject"/> + <object-type name="QAxObjectInterface"/> <object-type name="QAxScript"> <enum-type name="FunctionFlags"/> </object-type> @@ -59,5 +60,6 @@ <modify-function signature="addObject(QObject*)" remove="all"/> </object-type> <object-type name="QAxSelect"/> + <object-type name="QAxBaseWidget"/> <object-type name="QAxWidget"/> </typesystem> |