diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-27 10:10:02 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-27 10:51:02 +0000 |
| commit | e6e1e6c299702ae3a4af66d1ab766289a4dba8db (patch) | |
| tree | 6fa47ed329cd2454c3fcd9c6a48e57450d7925a0 | |
| parent | 8db52e56d06f02b0b7d2b135381875aa960ab3d0 (diff) | |
PySide6: Remove namespace QtQml
It was removed in
qtdeclarative/5a59cbfee71907c47587a1e3d340d31abfdc01ba.
Change-Id: I94c49dced3decb9089c1f8745468d080e0d0311d
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/pyside6/PySide6/QtQml/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtQml/typesystem_qml.xml | 3 | ||||
| -rw-r--r-- | sources/pyside6/tests/QtQml/qquickview_test.py | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/sources/pyside6/PySide6/QtQml/CMakeLists.txt b/sources/pyside6/PySide6/QtQml/CMakeLists.txt index be409ff81..2865cc2f2 100644 --- a/sources/pyside6/PySide6/QtQml/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtQml/CMakeLists.txt @@ -30,7 +30,6 @@ ${QtQml_GEN_DIR}/qqmlpropertymap_wrapper.cpp ${QtQml_GEN_DIR}/qqmlpropertyvaluesource_wrapper.cpp ${QtQml_GEN_DIR}/qqmlscriptstring_wrapper.cpp ${QtQml_GEN_DIR}/qqmlnetworkaccessmanagerfactory_wrapper.cpp -${QtQml_GEN_DIR}/qtqml_wrapper.cpp # module is always needed ${QtQml_GEN_DIR}/qtqml_module_wrapper.cpp ) diff --git a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml index 6281cb1e4..616682ced 100644 --- a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml +++ b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml @@ -71,9 +71,6 @@ <enum-type name="QQmlModuleImportSpecialVersions" since="6.0"/> - <!-- For qmlEngine(const QObject*), qmlContext(const QObject*) in qqml.h --> - <namespace-type name="QtQml"/> - <!-- expose QQmlIncubationController::incubateWhile() (see QtQml_VolatileBoolTypeF/pysideqmlregistertype.h) --> <namespace-type name="std" generate="no"> diff --git a/sources/pyside6/tests/QtQml/qquickview_test.py b/sources/pyside6/tests/QtQml/qquickview_test.py index d1a8fcf05..cd983f26a 100644 --- a/sources/pyside6/tests/QtQml/qquickview_test.py +++ b/sources/pyside6/tests/QtQml/qquickview_test.py @@ -40,7 +40,7 @@ from helper.helper import adjust_filename from helper.timedqapplication import TimedQApplication from PySide6.QtCore import QUrl, QObject, Property, Slot -from PySide6.QtQml import QtQml, QQmlEngine +from PySide6.QtQml import QQmlEngine from PySide6.QtQuick import QQuickView class MyObject(QObject): |