aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Pin qt5 sha1 for 6.6.2 release, take 2v6.6.26.6.2Simo Fält2024-02-121-1/+1
| | | | | Change-Id: Ib113b6862c2285cc5a09e5fb09291d3c1050dc80 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge branch '6.6' into 6.6.2Cristián Maureira-Fredes2024-02-0813-68/+222
|\ | | | | | | Change-Id: I6478a1b61b328f1ab4ad0606ae36974c37f97012
| * QTimer: Fix singleShot overload with contextAdrian Herrmann2024-02-083-24/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | The singleShot overload with context had a problem where if the functor was a slot of a QObject, it would not have a sender when it should. To fix this, the newly added QObject.connect() overload with context is used. Change-Id: I654c09efb0d1b37ea0c014e9f17cd5e1913d1a96 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 6b227000f28c82e189f3cc26275ca7a930f75e2f) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * build: undef slots to avoid conflict with qt in designercustomwidgetsCristián Maureira-Fredes2024-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | While using unity builds, the 'slots' definition seems to come before the Python.h include. Change-Id: I6ff147874fcad31b02438190c44cd70a8e573a1c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit b7112652408c2e2bb45be5f3f80cd6f6eb2026d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Brush up the usingmodel exampleFriedemann Kleint2024-02-072-32/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although not any more in Qt, it nicely shows the use of roles and delegates in QML. - Use a little data class for Person. - Change the custom role name away from "modelData" which is now a reserved name and caused it to no longer work. - Use a modern decorator. Pick-to: 6.5 Task-number: PYSIDE-2206 Change-Id: I3a3c1ad96f3a7ee89ada839236b45f461af149c7 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 1cb34de532ac9d5735d3bcbe7f6a40608d29e5ad) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * deploy: add pyside icons for windowsCristián Maureira-Fredes2024-02-071-1/+2
| | | | | | | | | | | | | | | | Change-Id: Ia8dc07da08cf90db5f847b595c33b649a5cdc55a Pick-to: 6.5 6.2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 9903b9154859e28b39fc30e104585902d8a7212d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * QObject: Add connect() overload with context argAdrian Herrmann2024-02-077-0/+137
| | | | | | | | | | | | | | | | | | | | | | | | On C++, there is an overload of QObject::connect() that allows passing a context object. This creates a connection in the context object's event loop instead of that of the caller. This implements said overload in Python. Change-Id: Ia6a098a04470741efd450818c31aa5bffb1bd9f8 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit acab25a3ccb836818e5089b23d40196bc7414b7a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * QObject: Add param names to connect/disconnectAdrian Herrmann2024-02-071-11/+10
| | | | | | | | | | | | | | | | | | | | Add parameter names to the QObject.connect() and QObject.disconnect() overloads for the stub file. Change-Id: Ida441288817046dc3eda043df5d64609a8b4f3bb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 290049e9e0066c195345afaa1ec573a1abe2f953) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * build/Linux: Fix shiboken6 failing to launch due to missing libicuFriedemann Kleint2024-02-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also ship ICU for the shiboken generator. Amends 43fe3494a9d902034896e3afa7b5158c77163be0. Pick-to: 6.6.2 6.5 6.2 Task-number: PYSIDE-749 Change-Id: Ib5529693fde51f245a90be0ae4a56139e3aadf45 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io> (cherry picked from commit 677839164f424e8cd844d4ff8b81c3a3297af1f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | build/Linux: Fix shiboken6 failing to launch due to missing libicuFriedemann Kleint2024-02-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also ship ICU for the shiboken generator. Amends 43fe3494a9d902034896e3afa7b5158c77163be0. Task-number: PYSIDE-749 Change-Id: Ib5529693fde51f245a90be0ae4a56139e3aadf45 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io> (cherry picked from commit 677839164f424e8cd844d4ff8b81c3a3297af1f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 118a932d0be9f28e773953e68466214a78c83023)
* | Pin Qt5#sha1 and bump version numbers for 6.6.2 releaseSimo Fält2024-02-063-3/+3
|/ | | | | Change-Id: I609c51824b239ba49517a73848454db2527520d3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add changelog 6.6.2Friedemann Kleint2024-02-051-0/+66
| | | | | | | Change-Id: I92bd9af13d5d9be07329a227132ac8da2e4b2d0e Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 7818b0ec48b22be39ebe4717cb3a729d941fb074) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide Tools: Fix flake8 warningsShyamnath Premnadh2024-02-0218-49/+47
| | | | | | | | | | | | | | - Fix general flake8 warnings in pyside-tools. - add F401 to .flake8 to ignore unused imports from __init__.py files - add E402 from __init__.py to prevent errors related to partial initialization of modules. Pick-to: 6.5 Change-Id: Ia848b08ff6f0d2808e04f6a83c46636e2d167c02 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit fec10bbbc097eff76a1f618f2791b3df1326594f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Fix callable invocationsFriedemann Kleint2024-02-014-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | - Always make sure to decref the result by using AutoDecref. - Check whether the callback passed to QAbstractOAuth::setModifyParametersFunction() really returns a dict. - Fix bool return of the callback passed to QWebEngineCookieStore::setCookieFilter(). - Some code cosmetics Amends f56329c995d4a708d4169ef52f819b38de1810b0, 535a781d534f4c9d102342a9813528e48c576ffd, 96715550f3d980dc5554c67a3660e94b6a9a3e76, cd394249fc77063a2bd6ba7a7633fdbc10621475, 5fac301e8e5a8d15eaff91d78b5deeeb2204c7b4, Task-number: PYSIDE-1612 Task-number: PYSIDE-1815 Task-number: PYSIDE-1912 Task-number: PYSIDE-2234 Pick-to: 6.5 Change-Id: I180ed4dfa63fe8ac06a898492244a85ed926c2d6 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit f6538d29fbd7d216ce00cdc2870c3a1055a24d26) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
* Documentation: Link the Qt Linguist and GNU gettext examplesFriedemann Kleint2024-02-013-2/+16
| | | | | | | | Task-number: PYSIDE-1112 Change-Id: Ica9c369f488afae6206b30e17d3743e0f3772642 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> (cherry picked from commit aca1566cb4697f0715a9897ee5c3734d63d128e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples: fix flake8 issues and add exceptionsCristián Maureira-Fredes2024-02-0186-129/+130
| | | | | | | | | | | | Exception for: - qApp and tr not being directly imported: F821 - *rc and qml modules being imported but not used: F401 Pick-to: 6.5 6.2 Change-Id: I5e40f3f54c1721ef3dc5d7f1e87d5fd8ec771b8e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 0555111721a2283a177864538fb437b31b148f63) Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
* flake8: Fix path for E402 exceptionsAdrian Herrmann2024-02-011-1/+1
| | | | | | | | | | flake8 should ignore E402 not only for Python files that begin with test but also for those that end with it. Change-Id: Ie8a99d8de69b40b641a5be24c87dca787b80222e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 594a41e3ea52e38b4c202325b2733f9484484c41) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Improve code snippet error handlingFriedemann Kleint2024-01-318-20/+70
| | | | | | | | | | | | | | Type conversion errors in code snippets can be hard to diagnose, particularly when they occur in an invalid context due to misspelt snippet markers. Add some functions wrapping the in try/catch, adding some context information to the error messages. Change-Id: I7e35f298497b7fd0b582f43d6941a683e18377b3 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 866f6620aaa852c6fafb4b96625017ad44ce0dcb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android Deployment: Remove personal fork of p4aShyamnath Premnadh2024-01-311-4/+0
| | | | | | | | | | | | - Android deployment worked by using my own fork of p4a. This can be removed now that the changes are merged into the master branch of p4a. Task-number: PYSIDE-1612 Change-Id: I530c6f6b6cbeffa80b3833c1d6efb50154eb47e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit f9e885010a55883a066c01b3ee48266b0a919df3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android Deployment: Explicit android group in config fileShyamnath Premnadh2024-01-313-11/+13
| | | | | | | | | | | | | | - Distinguishes the changes fields as only relevant for Android Deployment. - This distinguishing group makes it clearer when we finally have iOS wheels. Task-number: PYSIDE-1612 Change-Id: I215d2deec0117ae855e6d9a061642984eccd36ef Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit e934ae1999c6510ae2ba3cc29547c839c1a1089b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* flake8: deploy testsShyamnath Premnadh2024-01-313-8/+12
| | | | | | | | | | | | - general flake8 fixes. - this prevents flake8 from reporting E402 error for `from init_paths import init_test_paths` not being in the top of the file. Change-Id: Id21ef66979cb7e79db63c656cc150017751d1716 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 2653193e6989ea300339ff6ba7efde3597051f67) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android Deployment: Multi-architecture supportShyamnath Premnadh2024-01-301-115/+121
| | | | | | | | | | | | | | | - Supports creating wheels for all 4 Android platforms in one single run. - The earlier --plat-name option is now optional and takes multiple platform names. If the option is not specified, then wheels are built for all the Android platforms. Fixes: PYSIDE-2550 Task-number: PYSIDE-1612 Change-Id: I003e34046a88e792dde89a4d224918b5608111aa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit ac6c01d3d69af99da4bef66a4e20f07c9c15ffc6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android Deployment: Fix armv7a platformShyamnath Premnadh2024-01-304-5/+25
| | | | | | | | | | | | | | | | | | | | | - There were a couple of errors when building Android wheels for this platform mostly caused due to having an extra "eabi" for all the clang compilers, but also that the CMAKE_HOST_PROCESSOR name was wrongly specified. - The api_level passed while creating the cross_compile.sh script was also wrong as this should always be a number. - The CMake FindPython module returns Python_SOABI as empty for armv7a due to a possible bug in the FindPython module. The Python_SOABI is obtained by running `python3-config --extension-suffix`. python3-config be a script can also be run on the host platform and hence for armv7a, the Python_SOABI can be explicitly specified to workaround the CMake bug. Task-number: PYSIDE-1612 Change-Id: I3515db730b8c4f283f4c9f1d2e78fbc9d1aa903a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 713c75a0b2ec50573dfeb387dcf64dcd763b19a5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* pyside_tool.py: Work around console encoding issues on WindowsFriedemann Kleint2024-01-301-7/+4
| | | | | | | | | | | | Use subprocess.call() instead of capturing the output. As a drive-by, use stderr for error messages. Pick-to: 6.5 Change-Id: I28c9623754b0718cd4a5041475f451247ac5811f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 3297df54f240705e5e8058cbae39f3f6e41effb5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Document missing namespace attributesFriedemann Kleint2024-01-301-0/+12
| | | | | | | | | | Amends 91cb27a2a7180e9c05b806d870b266fa31bef041 Pick-to: 6.2 Change-Id: Id68305dbe40727e85c7d483e5692d0329bee2f02 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> (cherry picked from commit 7088823da7c04a433b140f070f18dba0d744f95f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QtAsyncio: Introduce quit_qapp argumentAdrian Herrmann2024-01-303-7/+28
| | | | | | | | | | | | | | | | | A new optional argument quit_qapp can be passed to QtAsyncio.run() to configure whether the QCoreApplication at the core of QtAsyncio should be shut down when asyncio finishes. A special case where one would want to disable this is test suites that want to reuse a single QCoreApplication instance across all unit tests, which would fail if this instance is shut down every time. Fixes: PYSIDE-2575 Task-number: PYSIDE-769 Change-Id: I49cd0a50311fb30cc50df9b7f6a6d73fe8c58613 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 3bc157720e37198c99e2d9c8ce38185b894b2fdd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android Deployment: Unify cacheShyamnath Premnadh2024-01-301-82/+107
| | | | | | | | | | | | | | | | | | | | | - Instead of creating a temporary directory and adding toolchain files, cross-compiled Python etc., these are now stored in .pyside6-deploy-cache and are cached. - -apic option removed. Since cross-compiled Python is now by default added to .pyside6-deploy-cache, this option can be removed. - Run `distclean` on the cloned CPython each time Python is cross-compiled. This lays the foundation for multi-architecture support. - Add a cli option --clean-cache to clean .pyside6-deploy-cache. More control is given with this option to clean only specific folders or files. - Remove unsued variable qt_plat_name. Task-number: PYSIDE-1612 Change-Id: Iaa0e35e49e0bf9650b97c87d2b8db3c6c86e0d5c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 59724b9a3160b9678ecfe98910fd75dd456089cd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add documentation on how to adapt to new Qt versionsFriedemann Kleint2024-01-293-0/+47
| | | | | | | | | | As a drive by, add a comment about QT6_DECL_NEW_OVERLOAD_TAIL to the QtCore type system file. Change-Id: Idf395158f955fb3114431a04542a26341f53a7af Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit d174ff9888069407a1042bce67ed63712ff1e69e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Prepare for making the global scope prefix configurableFriedemann Kleint2024-01-294-20/+19
| | | | | | | | | | | | | Use helper getFullTypeName() in more places. Remove the global scope prefix from wrapper classes, they should not cause ambiguities. Task-number: PYSIDE-2590 Change-Id: I47b6a69c27ea5469f8f11ec10fc349dec4689c60 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 791f7c7e882c3c1003c0f83173495d513e452d1f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* build: made shiboken6_generator depends on shiboken6 moduleCristián Maureira-Fredes2024-01-261-0/+2
| | | | | | | | | | This was forgotten on the old to new wheels transition. Pick-to: 6.5 Change-Id: I8d48671257e0aefd4ae03ee682df53cf7e309938 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 2491dac9095aeaeedad7ccb6e1b04ec0765e1b86) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: Update copyright year to 2024Adrian Herrmann2024-01-262-2/+2
| | | | | | | | | | The copyright year on the documentation footer hasn't been updated since 2021. Task-number: PYSIDE-1112 Change-Id: I8a8c1c07e77a9396479d08913f8e4b9133751bd6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 8754b6a71f7a14b6dc753fdeebc13e3cd09f778f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* build: move deps from setup.py to pyproject.tomlCristián Maureira-Fredes2024-01-263-15/+15
| | | | | | | | | | | | | | The usage of the new 'build' package version made the install_requires statement in our setup.py worthless, so we need to move for pyproject-specific configuration in order to get dependencies installed for some of our packages. Change-Id: I4e010e9c13ab005616b2e3948e3024da2a79ebea Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 29bc67566bf037d021da72e42290011c9d6d0206) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android Deployment: Remove deprecated optionsShyamnath Premnadh2024-01-261-2/+2
| | | | | | | | | | | - removed --ignore-git and --skip-docs - Fix some flake8 warnings Task-number: PYSIDE-1612 Change-Id: I76994ddf2f5c26f86ac8d6c2e422ac3764b09c01 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 1cd5bd554ed4cfb52dd0cd18bc4eace8676fe9d7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* build: check module consistency for wheelsCristián Maureira-Fredes2024-01-261-0/+32
| | | | | | | | | | | | | | A few modules have been excluded in releases because we haven't noticed they are missing from the wheels. This adds a small check to the wheel creation, so we can be aware of this situation. A similar check is done with the README content, which is what we list we are including in the wheels. Change-Id: I719e7d35b1466329a537c6095af01e705b7c6bea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 39ab1a9f93dba84af6e179edb9dfb7c3a1ca3cf4)
* build: update dependencies and processCristián Maureira-Fredes2024-01-257-77/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though some packages are 'safer' to update, we cannot rely on having the CI discovering it on random integrations. Pinning the remaining packages and ordering them a bit. The update of the 'build' package (to create wheels) required the replacement of 'build.pep517' by the new 'pyproject_hooks' module, and other modification to the wheel artifacts. The removed dependencies are currently placed at the tool level requirements.txt so it's not like they are not needed anymore. Test and CI scripts were adapted in order to rely on the 'dist' directory rather than the 'dist_new' one, removing the old step of creating the wheels with 'setup.py bdist_wheel'. The entry points (console scripts) that we used to have in the 'setup.py' were moved to the 'pyproject.toml' in order to advance towards not relying on the setup.py file. Flake8 issues were addressed in the different files that this patch modified. Change-Id: I83480c1920206e11fcb9a45264b6beaf6f8b686b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit db554a0cb574ddbb2bb27de7649976bcaa85cdfe)
* shiboken6: Indicate default parameters in the generated overload decisor codeFriedemann Kleint2024-01-251-3/+5
| | | | | | | | | Add a '='. Change-Id: Id2ce7fd618a32e74dd1de3b933754db15907c3e2 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 4369769c022130e26ef22b502e76c1252ebe3cc0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Document the lesser known aspects of adding modules/examplesFriedemann Kleint2024-01-252-4/+16
| | | | | | | Change-Id: Id3b7a411222808d7b783220dd6f383ad0de309dc Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 1414bfa6df945075fc0c385e885b65dff4ffa053) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Help fix: remove the extra '-' from --macos-use-libc++Shyamnath Premnadh2024-01-251-1/+1
| | | | | | | | Pick-to: 6.5 6.2 Change-Id: I6085b6fc651223eaec9a860abd61b39387f9643e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 8ad190e7ea9875983db97e30eb18609039f25a52) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Fix build with namespaced QtFriedemann Kleint2024-01-251-1/+4
| | | | | | | | | Task-number: PYSIDE-2590 Pick-to: 6.5 Change-Id: I977d3d93b4f8385329e154a493a12d24ee0ac196 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 5929c612b5bebb8e2bfa703e9db5ec20a077a0a0) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* doc: add missing modules from READMEsCristián Maureira-Fredes2024-01-251-0/+6
| | | | | | | Change-Id: I7d81fdfa8fdacd9f0ff7d6a27d9e4ffa7513c5be Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 52467260ccab48a4cbe0883e42bde586f694881a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* build: fix typo on module specificationCristián Maureira-Fredes2024-01-251-2/+2
| | | | | | | | | | This doesn't have an effect on the module inclusion in the wheels, it's just a typo. Change-Id: Id8651f231b2f0c01bb57ef39698b347ea5a76f05 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit a38aa4d9b6542927c1626fc152f550653bfd0e5f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make VS Code use .flake8 fileAdrian Herrmann2024-01-252-7/+1
| | | | | | | | | | | VS Code now uses the .flake8 file (formerly setup.cfg) for its flake8 configuration, instead of setting arguments in settings.json. Change-Id: I7f85a3ab14e2d2445c62185e593f5bec5d19a768 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit bd0f6c187c560a59884dd1c7640f9352ec457a6c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android Cross Compilation - Fix flake8 warningsShyamnath Premnadh2024-01-242-9/+8
| | | | | | | Change-Id: Id6e9cdbc7c0b763e8bbb4b7e8dc3ab568b65ebf8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 82aaa6484834b1429d34554512376397d5204e7e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Fix build with namespaced QtFriedemann Kleint2024-01-241-1/+1
| | | | | | | | | Task-number: PYSIDE-2590 Pick-to: 6.5 Change-Id: Ia52ba765e766f6b5318b2a7220d9cf3595697525 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> (cherry picked from commit 602245bc1e1ae39dad6441315036d86e70a9b742) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix flake8 warnings in shibokenmodule/mapping.pyFriedemann Kleint2024-01-231-36/+51
| | | | | | | Change-Id: I805616796658ff4eae8ba03a02c6ffea93fb9707 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit fcf1d51c3d6e2d8afa02a2e69665b7df9a6a97ca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: Fix error handling in qdoc_spawnerFriedemann Kleint2024-01-191-15/+16
| | | | | | | | | | | | | | Check on the exit code, not on the presence of warnings on stderr to determine failures. Amends 9bbbb29809ec7552698680a40e20ec271d929c67, cb4d09368dd3719e3e17afa07020c4d41fb03100 Task-number: PYSIDE-1106 Change-Id: I092b5f991c1bb114a1d51f73bd833da5aedaeda8 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 5dabf393f6175070890483040ee361ee59a84da2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Documentation: Generate inheritance graph only when base classes existFriedemann Kleint2024-01-181-5/+7
| | | | | | | | Task-number: PYSIDE-1106 Change-Id: I3fa21becfab476f947c94c0f22fb1234c98f2ea8 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 8c9d492d347941e812ccce4f9b972755388a5fd5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: propagate error from qdoc_spawnerCristián Maureira-Fredes2024-01-182-15/+22
| | | | | | | | | | Amends f2db4487f5902d47496bc9c00896f81566d3b59a. Task-number: PYSIDE-1106 Change-Id: Ibcc229d28e797235b7d62a471d1ff51917c59d80 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 9bbbb29809ec7552698680a40e20ec271d929c67) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken: Allow to disable pyi file generation for debuggingChristian Tismer2024-01-184-10/+18
| | | | | | | | | | | | | When developing difficult stuff like Lazy Initialization, it is convenient to have an option that ignores PYI generation. This way, translation can be successful, and pyi generation can then be debugged. Task-number: PYSIDE-2404 Change-Id: I68bd10af3754de3988556c4558d1331564f5dadb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 2bb8b0f7bef8521cd8ffc395169d2dd152d59a92)
* doc: use modified version of the sphinx themeCristián Maureira-Fredes2024-01-182-1/+10
| | | | | | | | | | | This modifies our requirements in order to use a forked version, including the option 'collapse_navbar' for the theme in order to avoid long build times. Change-Id: Id0f144d19927f481f254397babb95693c131bdc3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit cb4d09368dd3719e3e17afa07020c4d41fb03100) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>