diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-11-01 18:42:47 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:56:20 -0300 |
| commit | 2a87b74bfea936691db2eb97a8ab2788277869b6 (patch) | |
| tree | b4ec4ef4b62df6bf488301e243501ceac960fa46 /PySide/QtDeclarative | |
| parent | 792504f978441d0a7708ebdaabc4b4baf24fdff4 (diff) | |
Replaced TypeResolver by SbkConverter and SpecificConverter.
Also updated QtGui's WId conversion to Python 3.
Diffstat (limited to 'PySide/QtDeclarative')
| -rw-r--r-- | PySide/QtDeclarative/pysideqmlregistertype.cpp | 4 | ||||
| -rw-r--r-- | PySide/QtDeclarative/typesystem_declarative.xml | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/PySide/QtDeclarative/pysideqmlregistertype.cpp b/PySide/QtDeclarative/pysideqmlregistertype.cpp index 6c595167b..30844c671 100644 --- a/PySide/QtDeclarative/pysideqmlregistertype.cpp +++ b/PySide/QtDeclarative/pysideqmlregistertype.cpp @@ -93,8 +93,8 @@ int PySide::qmlRegisterType(PyObject* pyObj, const char* uri, int versionMajor, { using namespace Shiboken; - static PyTypeObject* qobjectType = TypeResolver::get("QObject*")->pythonType(); - static PyTypeObject* qdeclarativeType = TypeResolver::get("QDeclarativeItem*")->pythonType(); + static PyTypeObject* qobjectType = Shiboken::Conversions::getPythonTypeObject("QObject*"); + static PyTypeObject* qdeclarativeType = Shiboken::Conversions::getPythonTypeObject("QDeclarativeItem*"); assert(qobjectType); static int nextType = 0; diff --git a/PySide/QtDeclarative/typesystem_declarative.xml b/PySide/QtDeclarative/typesystem_declarative.xml index 91c2e487b..1bc18bad8 100644 --- a/PySide/QtDeclarative/typesystem_declarative.xml +++ b/PySide/QtDeclarative/typesystem_declarative.xml @@ -60,8 +60,7 @@ </enum-type> <inject-code class="target" position="end"> - Shiboken::TypeResolver::createValueTypeResolver< QList<QObject*> >("QList<QObject*>"); - PySide::initQmlSupport(module); + PySide::initQmlSupport(module); </inject-code> <object-type name="QDeclarativeExtensionInterface"/> |