diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-24 18:46:26 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-24 18:46:26 +0200 |
| commit | 0225a252f756359d1fca5474998a2a11cdbda46d (patch) | |
| tree | 1475ce065f1d71d9cd334e608062876f81af6a95 /sources/pyside2/PySide2/glue/qtwebkitwidgets.cpp | |
| parent | 2bc0decca59d867dbf893e34cf9f2ff9745ab603 (diff) | |
| parent | 6a22e8cb35cfccbacd65b56e193bf2ae83f205ea (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia09beccd944e1276caa6aecbeb248e69917b7115
Diffstat (limited to 'sources/pyside2/PySide2/glue/qtwebkitwidgets.cpp')
| -rw-r--r-- | sources/pyside2/PySide2/glue/qtwebkitwidgets.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/glue/qtwebkitwidgets.cpp b/sources/pyside2/PySide2/glue/qtwebkitwidgets.cpp index 086ee3b85..c0f182747 100644 --- a/sources/pyside2/PySide2/glue/qtwebkitwidgets.cpp +++ b/sources/pyside2/PySide2/glue/qtwebkitwidgets.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ // @snippet qwebview-page -SbkObject* _pyReturn = reinterpret_cast<SbkObject*>(%PYARG_0); +auto _pyReturn = reinterpret_cast<SbkObject *>(%PYARG_0); if (!Shiboken::Object::hasParentInfo(_pyReturn)) Shiboken::Object::setParent(%PYSELF, %PYARG_0); // @snippet qwebview-page @@ -67,7 +67,7 @@ if (_signalIndex == -1) { if (_signalIndex == id) { Shiboken::GilState gil; - PyObject* self = (PyObject*)Shiboken::BindingManager::instance().retrieveWrapper(this); + auto self = reinterpret_cast<PyObject *>(Shiboken::BindingManager::instance().retrieveWrapper(this)); if (self) { Shiboken::AutoDecRef _pyMethod(PyObject_GetAttrString(self, "shouldInterruptJavaScript")); |