diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-03-03 14:25:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-03-10 11:19:20 +0100 |
| commit | 2f82c63889cc9330ad759eea88f5a18e1821dfac (patch) | |
| tree | 6099d42ffe755c5b8f6b29bdf4c29b5df0cd3cca /sources/pyside6/PySide6/glue/qtgui.cpp | |
| parent | 077b30d72614f8d2176335f03e3a8568ccbcedc6 (diff) | |
PySide6: Move injected code snippets where they belong
Adapt to the restructuring in Qt 6.
Change-Id: I3cd65b8ee428fcc75de010efaa3595664a00eb97
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/glue/qtgui.cpp')
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtgui.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/sources/pyside6/PySide6/glue/qtgui.cpp b/sources/pyside6/PySide6/glue/qtgui.cpp index cc0f23cba..76932c07b 100644 --- a/sources/pyside6/PySide6/glue/qtgui.cpp +++ b/sources/pyside6/PySide6/glue/qtgui.cpp @@ -139,16 +139,6 @@ if (doc) { } // @snippet qtextblock-userdata -// @snippet qopenglshaderprogram_setuniformvalue_float -float value = %2; -%CPPSELF.setUniformValue(%1, value); -// @snippet qopenglshaderprogram_setuniformvalue_float - -// @snippet qopenglshaderprogram_setuniformvalue_int -int value = %2; -%CPPSELF.setUniformValue(%1, value); -// @snippet qopenglshaderprogram_setuniformvalue_int - // @snippet qpolygon-reduce const Py_ssize_t count = %CPPSELF.count(); PyObject *points = PyList_New(count); @@ -552,6 +542,20 @@ WId id = %1; %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](retval); // @snippet qwindow-fromWinId +// @snippet qshortcut-1 +%0 = new %TYPE(%1, %2); +// @snippet qshortcut-1 + +// @snippet qshortcut-2 +Shiboken::AutoDecRef result(PyObject_CallMethod(%PYSELF, + const_cast<char *>("connect"), + const_cast<char *>("OsO"), + %PYSELF, SIGNAL(activated()), %PYARG_3) + ); +if (!result.isNull()) + Shiboken::Object::setParent(%PYARG_2, %PYSELF); +// @snippet qshortcut-2 + /********************************************************************* * CONVERSIONS ********************************************************************/ |