aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Pin Qt5#6.1.2 sha1v6.1.26.1.2Simo Fält2021-06-291-1/+1
| | | | | Change-Id: I5f121332b07e18d871023a6a8d5792a12674d636 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Cleanup version strings for 6.1.2 releaseSimo Fält2021-06-292-6/+6
| | | | | Change-Id: Ib12833bf6e27e0d47ae7e34a7c7ffbb34e61d5ad Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix Qt6 dependenciesSimo Fält2021-06-282-3/+28
| | | | | Change-Id: I942d0e924e2b460e92bfed05d210cf4fe515fac7 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* PySide6: Update documentation on Qt Designer and resource filesFriedemann Kleint2021-06-283-15/+27
| | | | | | | | | | Link from typesoffiles.rst to the tutorials and flesh them out a bit. Task-number: PYSIDE-1112 Change-Id: I67fccb29d880bd2ba5af8e5dd77a4f6406ea55ad Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 020ada12c366e579b92803fd8a82010b8d93d87d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Add missing API of QQuickFramebufferObject.RendererFriedemann Kleint2021-06-284-4/+14
| | | | | | | | | | | | The virtuals taking and returning a QOpenGLFramebufferObject were missing since QOpenGLFramebufferObject was moved from Qt Gui to Qt OpenGL. Add the dependency to fix this. Fixes: PYSIDE-1611 Change-Id: Idfc234ce79b0619d5c2d8a8901f43733e210eafd Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit fc916c509263ac13083a8e00a8afc9d930ed0dd1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add changelog for 6.1.2Friedemann Kleint2021-06-251-0/+37
| | | | | | | Change-Id: Ia055b088b62b7b3192f03d48da9a183720dfc795 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 9bcfaeb9ca38460d03bc724368636b5133880e4b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Fix specification of qPixelFormatCmyk()Friedemann Kleint2021-06-251-1/+1
| | | | | | | | | | | | | | Fix warning: Global function 'qPixelFormatCmyk(uchar,uchar,QPixelFormat::AlphaUsage,QPixelFormat::AlphaPosition position,QPixelFormat::TypeInterpretation)' is specified in typesystem, but not defined. This could potentially lead to compilation errors. Amends 6938ca19e7a2b200ee83fdddce3c5908199c1f75. Task-number: PYSIDE-1482 Change-Id: Iaa943dc25e06f5937e4ba8379beca82d523ca704 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit a96317126d48894b7e2c7a4fb01a751aad97280c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6/doc generator: Resolve relative, local .html documents to doc.qt.ioFriedemann Kleint2021-06-251-1/+23
| | | | | | | | | | | | | | | Links to relative, local .html documents as generated by qdoc into the WebXML files are currently broken in our documentation (800 cases). They are syntactically not recognized by sphinx nor could be resolved in the HTML file tree. Expand them to URLs to the doc.qt.io web page. Task-number: PYSIDE-1112 Change-Id: Ibdc7f9c47db6d26c088678aa67f1a320542f68e0 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 2167ad24f81515a414a655742963fd4b3899ddb2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6/doc generator: Extract method to resolve links to ↵Friedemann Kleint2021-06-257-58/+97
| | | | | | | | | | | | | | QtXmlToSphinxDocGeneratorInterface Extract the private struct LinkContext to a public struct QtXmlToSphinxLink with debug operator and add a resolve method to QtXmlToSphinxDocGeneratorInterface. Task-number: PYSIDE-1112 Change-Id: I91b3bc45ebc530394a3e77c56b05dd5b740e8985 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 991cfb9376275e1ab259f0a9b95302bc56ba7127) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6/doc generator: Fix tables nested in paragraphsFriedemann Kleint2021-06-252-19/+52
| | | | | | | | | | | | | Tables embedded within paragraphs were broken since they were rst-escaped and newlines simplified by the </para> handling. To fix this, end the <para> when a <table> is encountered and restart again afterwards. Task-number: PYSIDE-1112 Change-Id: I2d97d8bfd9f1a838853c58b6a657aa9e4cf719e6 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 9a7f4732c3bd0758fe3a47ff7022a2fbcf4d2dcf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* build_scripts: Pass --quiet to build_rst_docsFriedemann Kleint2021-06-241-0/+2
| | | | | | | | | | Otherwise, the log messages from the example gallery clutter the sphinx warnings from the shiboken manual. Change-Id: I1a8e3b685a4bfb830baea3a2221fc7980fee24e1 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit d1c2b27278c23b3a00475aaf2528006337d22f90) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Small refactoring of QtXmlToSphinxFriedemann Kleint2021-06-242-15/+15
| | | | | | | | | | - Use member initialization - Use QSharedPointer in the buffer stack Change-Id: Ib6a9aeab422c414a073140a401593c06c119cdbe Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit c5a8cad30b7b800e83e22e39bfa257871e28572a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Remove dependency of QtQml on QtGuiFriedemann Kleint2021-06-232-5/+1
| | | | | | | | | QtQml is the base language, it does not need QtGui. Change-Id: I9bd8886700bb3c20b32f7c2f0f118030a3b1fc16 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 63e715b17bab0362941d04edd16e9e017fcdb18d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6/signature: Fix error handlingFriedemann Kleint2021-06-231-6/+5
| | | | | | | | | | | | | | | | | | | | Raise an error if != 2 tokens are obtained from the argument, changing packages/shiboken6/files.dir/shibokensupport/signature/parser.py", line 121, in _parse_line name, ann = tokens ValueError: too many values to unpack (expected 2) to packages/shiboken6/files.dir/shibokensupport/signature/parser.py", line 119, in _parse_line raise SystemError(f'Invalid argument "{arg}" in "{line}".') SystemError: Invalid argument "method:QWebEngineHttpRequest::Method" in "0:PySide6.QtWebEngineCore.QWebEngineHttpRequest(self,url:typing.Union[PySide6.QtCore.QUrl, QString]=QUrl(),method:QWebEngineHttpRequest::Method)". Change-Id: I16e0f32bb3332deadc0a8819a6ba7abd6b12a941 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit e6fb38a92efac1e098a87d2a6947807708652369) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6/signature: Remove obsolete modulesFriedemann Kleint2021-06-231-22/+0
| | | | | | | | Change-Id: Ib26f3b8a5f2942380d2f6d9f8e56f839fbbdfe03 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 322c5abf75aaa10299e7b76742f9316efc60caec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6/features: Fix compiler warningFriedemann Kleint2021-06-231-0/+2
| | | | | | | | | | | | Assign isStdWrite in parseFields(), fixing: libpyside/feature_select.cpp: In function bool PySide::Feature::feature_02_true_property(PyTypeObject*, PyObject*, int): libpyside/feature_select.cpp:689:59: warning: ‘isStdWrite’ may be used uninitialized in this function [-Wmaybe-uninitialized] Change-Id: I4527444a67ee3ca6e886802a76aa4508c8ca3a7c Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 47506f16c1ea10a9a17d9cfe980388afc0bd8593) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6/QtMultiMedia: Adapt to API recent changesFriedemann Kleint2021-06-236-53/+51
| | | | | | | | | | | | | | | | | | | | | | | Build against qtmultimedia/a6e014eb088cb9b7bf55bf87c814e75cd4037dc2: - Re-add QAudioInput, QAudioOutput, qtmultimedia/9fd208f11a218d8a8b07fc525258eea3b3596d62 - Rename QCameraImageCapture to QImageCapture, qtmultimedia/83a031c56b74d68fe6d349f78c48a1681e40374e - Remove QImageEncoderSettings, qtmultimedia/d58d93b8e45b2bf62221b104914df771849c007c - Remove QMediaEncoderSettings, qtmultimedia/9c309ede2feb598908b1476062b79d0d23759bf3 - Changes around QMediaEncoder, qtmultimedia/fde5d6f7cce6118cac4ce7b92cd056225737917f qtmultimedia/994bcb23af8399485ddfdd16d2ba34c20326b432 - Comment out QMediaPlaylist, qtmultimedia/5773f7214c7430a98dea3974c0597cb3ee0ea7f5 Change-Id: I9beb96c34ebe6132ad68e3628fcbbf0bc48127ef Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit e275299e9aef84fd9ab8401fba54b34873a43af2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6/Doc generator: Fix continuation dots in code snippetsFriedemann Kleint2021-06-191-3/+3
| | | | | | | | | | Properly indent them after ::. Fixes a number of sphinx warnings about "Unexpected indentation" in data visualization examples. Change-Id: I5ebf2df629dda5fba86b7e25a320cbe89e7dfb8b Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 2e573af438e440bb2041370d99b2a2e0147ea65d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6/Doc generator: Dedent documentation code snippetsFriedemann Kleint2021-06-197-75/+151
| | | | | | | | | | | | | | Split out helpers for fixing code snippets from class CodeSnipAbstract (which is necessary since the QtXmlToSphinx test is compiled from single source files) and use them. Fixes a number of sphinx warnings about "Unexpected indentation" in data visualization examples. Change-Id: I109f5f6a8158689f5c966630f1b29d797b48607d Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 772f117d30c567c397944d62c9084360bb071d83) Reviewed-by: Christian Tismer <tismer@stackless.com>
* PySide6/QSignalSpy: Add constructor taking a signalFriedemann Kleint2021-06-194-0/+76
| | | | | | | | Task-number: PYSIDE-1482 Change-Id: Ifb9061af1828e7348de3ad5407c830aeb7d4f386 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit d3388316c3ac87c19cc668d9b5bca2b988db74ca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6/Doc generator: Fix HTTP URLs in documentationFriedemann Kleint2021-06-181-5/+8
| | | | | | | | | | | Always use as "external", do not reformat them as RST labels. Fixes for example the link to the Sinclair ZX Spectrum page in the QLCDnumber documentation, which appeared as WebXML link tag and was reformatted. Change-Id: Ibf0195365488979bdfd3e08cdd59e77860ac30f6 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 705b80e6a427ac9d27e0e1911e1bdcfb17634b12) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Add a check-function attribute to custom type entriesFriedemann Kleint2021-06-186-4/+93
| | | | | | | | | | | | | | | | | shiboken knows some check functions and defaults to typeName + "_Check" in the end. For custom types in modified function arguments, it is useful to be able to specify a custom check function so that the overload decisor finds the right type. Add a CustomTypeEntry class with a checkFunction member for this. [ChangeLog][shiboken6] It is now possible to specify a check function for custom types in the typesystem. Change-Id: I21ec541afd5073dede09d359f2e2e16a0c6a0a05 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit d2752b4bd15387c906f0d994a49db16225c395e0)
* shiboken: remove obsolete error messageChristian Tismer2021-06-183-21/+0
| | | | | | | | | | | | | This message became pointless in PySide6 because the word "iterator" no longer creates clashes in shiboken and PySide. Thanks for checking this, Friedemann! Change-Id: Ib0496039ab194049fd1f09867de1bbcfeb47d21e Fixes: PYSIDE-498 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit fd3dbb4678526535bb3e50d39dd69d590304890b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Add QKey support for the setShortcut methodCristian Maureira-Fredes2021-06-185-3/+17
| | | | | | | | | | | | | | | | | | | When this method is used in Qt/C++, the argument gets internally cast to a QKeyCombination if it is a QKey, but in Python land this is not automatically covered. A workaround was for the users to manually cast the QKey, but this adds an extra step to achieve the same. This patch adds a new method to QAction and QAbstractButton to use setShortcut with a QKey as an argument. Change-Id: I9e9ebe16a65cb5aeb26a367faecbbbd414d80e03 Fixes: PYSIDE-907 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit a45ee7a68e3fbcf99eb31e8a395779cc0a9f3540) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Add further global functionsFriedemann Kleint2021-06-187-4/+46
| | | | | | | | Task-number: PYSIDE-1482 Change-Id: I337f8c817bc4d612a02a5482a63a94303e11c300 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 6938ca19e7a2b200ee83fdddce3c5908199c1f75) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* testing: enforce that .pyi files are always testedChristian Tismer2021-06-185-8/+58
| | | | | | | | | | | | | | | | | | | | | | Being able to run .pyi files in Python 3 is always assumed possible. Since this test is disabled in local builds, we were relying on correct configuration of COIN, but that failed. To be safe, we now add a test to wheel_tester as well that unconditionally tests all .pyi with all features enabled. A special problem was a name clash in Qt3DAnimation.pyi which uses the name "property" :-) An import of QtMultimedia seems not to work, always. This happened in wheel_tester.py in CI, only. Task-number: PYSIDE-1599 Change-Id: Ib158e710cec72287fe4a71c01254727ea9b6dc54 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 4269e3535b7b97c188a6d8377e685586da89592f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Update documentation on global functionsFriedemann Kleint2021-06-182-10/+13
| | | | | | | | | | | It is actually possible to modify a global function with modify-function, update the documentation accordingly and link the nodes. Change-Id: I2fd313851712cd96c67fcd90d68664f57dc0902a Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 7e8d8d1a9adb4f75b878f4b5267b59c5a81170df) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* build scripts: Remove qtchooser handlingFriedemann Kleint2021-06-172-24/+6
| | | | | | | | | qtchooser does not exist in Qt 6. Change _qmake_command to a string. Task-number: QTBUG-75870 Change-Id: I6eb69fbd839567ba0e67c9d792666662126494cc Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 579372b8d45f847ddaae14b361b9d8ca54c044f3)
* PySide6: Fix some shiboken warningsFriedemann Kleint2021-06-173-5/+0
| | | | | | | | | | | | sources/pyside6/PySide6/QtCore/typesystem_core_common.xml:3019: enum 'QJsonDocument::DataValidation' is specified in typesystem, but not declared. sources/pyside6/PySide6/QtCore/typesystem_core_common.xml:2353: signature 'lock()' for function modification in 'QMutex' not found. sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml:504: signature 'operator<<(QPointF)' for function modification in 'QPolygonF' not found. sources/pyside6/PySide6/QtQuick/typesystem_quick.xml:108: enum 'QQuickWindow::NativeObjectType' is specified in typesystem, but not declared. Change-Id: I2d36246c2b3df4b7a7a5678dd3eedf73601a85ef Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 4b0185393fa46bb1944877303b878c7f3be747ec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Add more non-template QML functionsFriedemann Kleint2021-06-172-2/+28
| | | | | | | | | | | [ChangeLog][PySide6] A number of free functions from QtQml have been added. Task-number: PYSIDE-1482 Change-Id: I51842df17d9f1c1f9f07d6e3f324d0bf273b476a Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 1fcc2323b7e85ba7f71e81a97eb36567f74b37a9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6/signature: Add PySideSignalInstanceFriedemann Kleint2021-06-171-0/+2
| | | | | | | | | | Amends d3388316c3ac87c19cc668d9b5bca2b988db74ca. Task-number: PYSIDE-1482 Change-Id: I0a3b73ac632bca5953eb624f8e5a932d2a83f2e1 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 7a721bea41d41e222a3dad2a02cb2d11b3ad396d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Expose QHostInfo.lookupHost()Friedemann Kleint2021-06-174-1/+123
| | | | | | | | | Fixes: PYSIDE-1160 Change-Id: If8fa16d965fcadaf622beee9ee45e207dc7195d8 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit e392613181ef5d8592989addbd01f96dbebf65e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Fix signature of CoreApplication.instance(), fixChristian Tismer2021-06-171-0/+1
| | | | | | | | | | | | | The "Optional" keyword cannot automatically be deduced and therefore needs to be added to mapping.py . Amends 890256cc048452e4632eacc6e8882bd5821f07f3. Fixes: PYSIDE-1467 Change-Id: I105a52c124f43c88c2633dcb325fa4ed95f033ae Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit cbcb9ccd3a89be02ce0ee770f866d78177f56bf2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Fix duplicate indexes for template instantiationsFriedemann Kleint2021-06-164-28/+53
| | | | | | | | | | | | | | | | | | | | | | | For a typedef "using Foo=QList<int>", shiboken generates SBK_QLIST_INT besides SBK_FOO which is then matched by function arguments. The code was however missing a check to restrict this to typedefs, so it triggered for class Alternative : public QVariantList, class Sequence : public QVariantList producing duplicate indexes. Restrict this to real typedefs (which are also represented as classes. Split out the function creating the special alternate index for clarity and add a check for potential equivalent typedefs which would also produce clashes. Task-number: PYSIDE-1571 Change-Id: I9275963c4ddb8fc589e414ee1fa19282f6004793 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 42c0854f077d004dba43b713ec2cabb76747a270) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken: Fix a crash when running .pyi files in Python 3Christian Tismer2021-06-163-6/+13
| | | | | | | | | | | | | | | | At the same time, a small overestimate of structures was fixed: The asterisk was missing here: PepHeapType_SIZE + sizeof(SbkObjectTypePrivate *); An omission in module enum_sig was fixed for Qt3DCore: Instead of __name__, __qualname__ is needed. Task-number: PYSIDE-1599 Change-Id: Ifd6d70c4c1166a822c8ca517c0d3663c2fc00565 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 10922e8f48bcd5a018465e663aeeae6023b3ef4c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples: add screenshots for 3d, axcontainer, chartsCristian Maureira-Fredes2021-06-1634-0/+167
| | | | | | | | | | | - Add screenshot - Add one-phrase for each example from doc.qt.io Task-number: PYSIDE-841 Change-Id: I72ee7b34d9ecfd595c7e6301fe1576086bc82203 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 8c8de4b7db40e6c130b74e12cba57b01b58e9dad) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Always set QTEST_ENVIRONMENT when run in Qt CISimo Fält2021-06-162-3/+3
| | | | | | | | | | Previously we set that only when running test. Change-Id: I2102e591737d0c9febf26406fb32ef33f1cb94dd Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 63144841ee813bf2cdddb90702cb3490ee4228f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Silence warnings about unused variables when disabling wrappers ↵Friedemann Kleint2021-06-161-2/+8
| | | | | | | | | | | | of abstract classes Amends 71d940b4d426e19b39843e773e345a5147cf9cc5. Task-number: PYSIDE-1568 Change-Id: I6b3dc4bd01a2cf561a4b85116c853e15aa9ee2c1 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 3a87cb561c8b4bf364b9e61997b5d01b9781d39b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update blacklist.txt for errors in debug modeChristian Tismer2021-06-161-0/+5
| | | | | | | | | | | | | | | There are two hard-to-solve refcounting bugs that are only detected in debug mode. For the new Windows debug test setup (hopefully coming soon), these errors need to be ignored. Task-number: PYSIDE-68 Task-number: PYSIDE-79 Change-Id: I86bb3fa06cc201e5c123aa3f7cff1d814d44e242 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 8f1ebf5830edaf417a213d6a632cfbdbe3306e8c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* libpyside: Streamline CMakeLists.txtFriedemann Kleint2021-06-161-41/+7
| | | | | | | | | | | | Add the Qt libraries directly instead of building the include paths by hand. Task-number: PYSIDE-802 Change-Id: Iaeb2f8cfe6638b9e73a96f5c508d928e7e19aea5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit cd1022b1216dbf67bb553b7fc65106d91e95643d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revert "Allow calling CI's build scripts with python2"Friedemann Kleint2021-06-151-7/+1
| | | | | | | | | | | | Python 2 is obsolete. This reverts commit 6635c196f3813f722c3498ecd98a4fbf4bf14741. Fixes: PYSIDE-1437 Change-Id: I2eae44459efd6b4b9a6473563c4b5864ad932bd5 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 2732a1a2182b371d8c29ed18db5db87763565518) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Add Qt::FindChildOptions to QObject::findChild(ren)Friedemann Kleint2021-06-143-13/+49
| | | | | | | | | Fixes: PYSIDE-905 Change-Id: Iae343d15fb0db1d37f95ab2d443596777d2dfac6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit c6b66ffab442d5ad9f0eb6a1d2dafec8bdded245) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples: add default imageCristian Maureira-Fredes2021-06-122-4/+6
| | | | | | | | | | | Adding a default image for examples that have no screenshot yet, or are terminal based. Task-number: PYSIDE-841 Change-Id: I771173801218654a99f11d1062df12aa10a64eec Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit d0c6c06df04ee23fe523b477e9fb2a508cf78f3e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples: add screenshots to more modulesCristian Maureira-Fredes2021-06-1246-7/+203
| | | | | | | | | | | | | | | | | | | | | | | | | Adding screenshots and small documentation file to the modules - corelib - datavisualization - external - opengl - quick - sql - uitools - webchannel - webenginewidgets - some widgets - xml Renaming the widgets gallery due to name conflict with the quick controls gallery, and fixing two typos from contextinfo.py and hellogl2.py. Task-number: PYSIDE-841 Change-Id: I2705e5d605fa738da0dca906cf6acb4b9d5d3dcd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 090d4fba6a444590d850c697472e5fbcef46b0a4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples: add screenshots to widgets and othersCristian Maureira-Fredes2021-06-1261-4/+281
| | | | | | | | | | | | | | | | Adding screenshots to: - declarative - multimedia - network - widgets Renaming examples to avoid conflict on images names. Task-number: PYSIDE-841 Change-Id: I21f403ee62b45c0cb2a45eca6c5c99f11901610e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 32222315eb32177d4161ee2e417d9910a07f6039) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples: tweak css for the galleryCristian Maureira-Fredes2021-06-122-2/+24
| | | | | | | | | | | - Using cards with buttons - Fit images as a cover for each example Task-number: PYSIDE-841 Change-Id: I1702fbad8fabc9d0f9e2a06d46afcf73b4075c8d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 8bacb6a2f31681991494348353fc7c332dd9b4e7) Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* PySide6: Refactor qvariant conversion codeFriedemann Kleint2021-06-111-8/+18
| | | | | | | | | | | | | Use a switch on the meta type id instead of string comparison and catch None-cases in qvariant conversion early on (QMetaType::Nullptr and QMetaType::VoidStar with 0). Task-number: PYSIDE-1585 Change-Id: I05da179b8eef6f9a9b86a66e1c40762b655bd724 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit f8205c58207fd6c35ce743fc931392bac49ccc2f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Add QSignalSpyFriedemann Kleint2021-06-114-1/+70
| | | | | | | | Task-number: PYSIDE-1482 Change-Id: I7a413a5ca3e64e9270026d4ea5d73d28df20ca5c Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit d9070999d95ed1aec9768425e70f6d300fa5bef1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Use replaced types in functions signatures in generated codeFriedemann Kleint2021-06-103-18/+37
| | | | | | | | | | | | Add AbstractMetaFunction::minimalModifiedSignature() to be used in the overload decisor comments and split the formatting helpers accordingly. No caching is required as it is called only once. Task-number: PYSIDE-1588 Change-Id: I29b7d6ba33bfe3f4348234697ef1ef8112f86ac9 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 60132e11037c7645efdc6b4e8a3f9f231ee6133b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PyClassProperty: Correct the decorator and publish the classChristian Tismer2021-06-1011-42/+66
| | | | | | | | | | | | | | | PyClassProperty is now correctly published as a QtCore class and existing as an import. As a side effect, a bug was fixed where a syntax error occurred because of a missing signature count. Task-number: PYSIDE-1019 Fixes: PYSIDE-1593 Change-Id: Iae733280d9f9c23244e83a356011104bf527c329 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 6acc53a4e426fee336a8577581f579d6c173c7bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>