aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Build macOS universal binaryv6.2.2Simo Fält2021-12-013-3/+35
| | | | | | | Change-Id: I0a889258ec4f89ca3a26c8bf2ee76f0d5c676a7a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit e94154f02bf8f93e812dcc4edb633b9fd03331b0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Enable CI test on arm64Simo Fält2021-12-014-17/+71
| | | | | | | Change-Id: I26aff00644d85931b5e8ac597c1c5c3c9edb74e9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 4debb1824ab57fc1529db630f51366ece7398f74) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Pin Qt6.2.2 sha1 for releaseSimo Fält2021-12-011-1/+1
| | | | | Change-Id: I63278a13104a117f5a73e5c228d46436f1ade6c3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Cleanup version strings for 6.2.2 releaseSimo Fält2021-12-012-6/+6
| | | | | Change-Id: I43d81604f059084f82b4031de5e796dfd483f460 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add changelog 6.2.2Cristián Maureira-Fredes2021-11-291-0/+76
| | | | | | | | Change-Id: I23b199b86ee473d1b477b0f28fc919d19f31846e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit b0cd550152ce5ec8e1f36ccb71f713fccca64e66) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Prospective fix for stabilizing qthread_test.pyFriedemann Kleint2021-11-291-32/+23
| | | | | | | | | | | Test both signals started/finished() in one test function and have QThread.finished() call CoreApplication.quit() as well. This avoids waiting seconds. Change-Id: Ifa85db36f0b2e52baaf135b9ca7e63fbfc2ef7fd Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit f39648ddf900c6845c1ad54187ead34ac41cd354) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* snippets_translate: Enable all modulesFriedemann Kleint2021-11-293-15/+26
| | | | | | | | | | | | | | Fix a fixme commment. To make this pass, make the conditions matches more strict and add some warnings and error handling. Remove the checking of stderr from the CMake statement as this will produce some warnings. Task-number: PYSIDE-1721 Change-Id: I8aeefa8355144d98524a622733d82d337cd3c23b Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 9b887937f971887a32aefd584cc247bc7ec0f36e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix customgeometry.pyproject fileFriedemann Kleint2021-11-292-5/+6
| | | | | | | | | | | | | | | | It caused: File "tools/example_gallery/main.py", line 298, in <module> content_f += get_code_tabs(pyproject["files"], out_f) KeyError: 'files' Amends b9ec49942b3ad53343317e631320c58e59736c22. As a drive-by, handle the error in the gallery tool. Change-Id: Ideca9ccb72021780cf8ae7b3f2204733cc2f5e4f Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 49353faf76fd8d9a26e6304a5816ccc026c5f9a1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* setup.py: Simplify logic of qmake and qtpaths lookupAlexandru Croitor2021-11-293-32/+26
| | | | | | | | | | | | | | | | | | | If an explicit qmake or qtpaths option is given, use it to determine the Qt prefix dir. If no option is specified, try to find qtpaths in PATH. Don't try to find the sibling tool as we did before this change, there's no benefit in doing that. Either one can be used to query the required Qt information. Make sure to log both tool paths. Amends 3b4764fefbb349eafb831b5da90f565b34c77a52 Change-Id: I03afaa8d8476b3d09affdde28f3ff6f1fdf652b6 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit ed095a59eb91b48bd4e62e0b3d6005ab2d058d17) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add QtQuick3D moduleCristián Maureira-Fredes2021-11-2919-0/+1591
| | | | | | | | | | | | | Adding the module that contains a few C++ classes. Adding the 'intro' example. Adding the 'customgeometry' example as well. Fixes: PYSIDE-1708 Change-Id: I0681f087e74c13c024bb1dfa8de545b30f95d7d8 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit b9ec49942b3ad53343317e631320c58e59736c22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* snippets_translate: Fix broken loggingFriedemann Kleint2021-11-271-1/+1
| | | | | | | | | | Amends 742a39962f1ba9c0e42f387394768c13793144c0 Task-number: PYSIDE-1721 Change-Id: Ib1cbfd99a7a96e902df4f273c0b997e694a6a7a9 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit b133b16324647d68534558038901105206794f09) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* snippets_translate: Handle header files as wellFriedemann Kleint2021-11-272-11/+10
| | | | | | | | | | Use suffix .h.py for them to distinguish them from .cpp files. Task-number: PYSIDE-1721 Change-Id: Iea4bfa770833f319b65c1ea7f83fb1a325ce8c62 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 6fd1e6619b0aeef1f7e916e474693157450e765f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* snippets_translate: Streamline writing filesFriedemann Kleint2021-11-271-12/+12
| | | | | | | | | | | | | | | The code created all example directories first and extracted the snippets to .cpp files which were later moved to .py files to overwrite the snippets in the repository (back then). Write to the Python file directly and create the directory only when needed. This removes a lot of empty directories. Task-number: PYSIDE-1721 Change-Id: I38e695db4aae386be18cd3b85708f684bfa228d5 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 742a39962f1ba9c0e42f387394768c13793144c0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* snippets_translate: Fix example pathFriedemann Kleint2021-11-271-1/+1
| | | | | | | | | | Remove superfluous doc/codesnippets element. Task-number: PYSIDE-1721 Change-Id: Iff81bf9b3dc7a26d3f9c8924a450508ccbdb1dd4 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 37ff1a731a8c5e6d7b0370ad261739786b552c31) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* setup.py: Don't add the Qt prefix dir to PATH env var before buildingAlexandru Croitor2021-11-261-5/+7
| | | | | | | | | | | | | | | | | | | | | | Modifying PATH influences which packages are found by CMake's find_package, as well as which binaries are available to execute during the CMake build phase. Instead of relying on PATH, we should rely on passing the detected Qt prefix dir to CMAKE_PREFIX_PATH. This makes the build process more robust against differences in environment variables, as well as ensuring reproducibility when incrementally rebuilding a project manually without going through setup.py. Task-number: PYSIDE-1033 Change-Id: I9c36d9924b82cb1133c44f4ef44ca785bbf7e862 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 99e49333432ab2ca7c185f2504e09480ae8de880) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* setup.py: Fix no log messages being shown during setup callAlexandru Croitor2021-11-261-4/+12
| | | | | | | | | | | | | | | | The default verbosity of a log object is WARN. distutils then set it to INFO when initializing the Distribution object. This would not affect the log object copy that setuptools exposes (and we now use). This caused the usual INFO messages not to be shown anymore. Explicitly set the setuptools log object verbosity to INFO unless the quiet option was given. Amends 95a5bb9dd3b5d3fa86f2ed0868e2b821256a6028 Change-Id: I793dc92582007895fa23d43baabe5b97c146552e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 4b78450bae8bf839d6d438bc4f92efdcdc3979a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Cleanup documentation building codeAlexandru Croitor2021-11-264-37/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move conditions on whether documentation should be built inside the doc project, rather than outside. Look for qdoc and qhelpgenerator both in PATH and via find_package(Qt6Tools) calls. Add sanity checks that the various tools used in the add_custom_command calls are actually available. Show a warning or error when they are not available, depending on combination of whether it's a standalone doc build or part of the overall shiboken/python build. Set DOC_OUTPUT_FORMAT to html by default if it's not specified. Clean up some of the warning messages. Make sure to check the result of running execute_process on the snippets tool. Task-number: PYSIDE-1718 Change-Id: I2969d7a40961881ad0f91d7142b29a7f4130f3b7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 39f47bc8f61e8986a729a153cba619761bacc280) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* setup.py: Add missing DistutilsSetupError importAlexandru Croitor2021-11-261-1/+1
| | | | | | | | | | | DistutilsSetupError should be imported instead of DistutilsError. Amends 95a5bb9dd3b5d3fa86f2ed0868e2b821256a6028 Change-Id: I9db9dd5114ef4413b57da2f60e3441071c122635 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 042b9538f9e18ea731eca14e55afe3836e1967d6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* snippets_translate: Fix parsing of overlapping snippetsFriedemann Kleint2021-11-261-41/+42
| | | | | | | | | | | | Change get_snippets() to return a flat list of all snippets. It internally uses a list of active snippet ids to decide whether a line should be included. Task-number: PYSIDE-1721 Change-Id: Ifaa313a7aaa36dd125767b8b0c50a25db637c0ed Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit ca127cd9b5fe130101333da0ac5b5a09b8373dc2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Move from distutils to setuptoolsCristián Maureira-Fredes2021-11-2614-88/+132
| | | | | | | | | | | This is motivated by the deprecation of distutils, and removal in future versions https://github.com/pypa/packaging-problems/issues/127 Change-Id: I16448b69f98df6dc1d9a904b69eb69ed5f1093f5 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 95a5bb9dd3b5d3fa86f2ed0868e2b821256a6028) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Fix build after header rearrangementFriedemann Kleint2021-11-261-0/+3
| | | | | | | | | | | | | | qtbase/b55957b9048abf86a5719dd740c4dc0574566e21 removed qproperty.h from qobject.h, causing errors about missing Qt::beginPropertyUpdateGroup(), Qt::endPropertyUpdateGroup() from qtbase/fdedcb6ec650236bef4a8c8f005b5dd24ef7d77a. Fix by including the header. Change-Id: I70ee0449c1cb1aedccd35b6e470cd33af4b5fba1 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit c8fa81de801f09219ef883b72112424baf7c583a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Brush up the blurpicker exampleFriedemann Kleint2021-11-264-47/+39
| | | | | | | | | | | | | | | - Fix the example comment - Use Property decorator - Use leading underscore for private member variables - Streamline the code a bit. Amends ea3851cdaf7f13f62fe9ae23b96750cd70468294. Task-number: PYSIDE-841 Change-Id: I66843d692a4fa6d0db7da2468ed4358ec48bcd8b Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 4750567706f0e993ca5637071815bfee9841e13b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* debug_windows.py: Fix --help handlingFriedemann Kleint2021-11-251-13/+13
| | | | | | | | | | | Pass the unmodified arguments to the arguments in case help was requested. Add the verbose description text as an epilog. Also display help when invoked without administrative privileges. Change-Id: I1580afbda1455be6d4ddedc6390f4d6f24990b83 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 106b9c0871f6de63b78f2c59bcf16c21d60bb5a8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Handle None as a shared pointer parameterFriedemann Kleint2021-11-254-8/+44
| | | | | | | | | | | Add checks for None to the copy converters. Task-number: PYSIDE-454 Change-Id: I03954189e26572d248e22118954115bf8281b0f9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 6c8c0142a99aa0c170998b3449ea20e5a526d80d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Add further methods to smart pointersFriedemann Kleint2021-11-258-0/+67
| | | | | | | | | | | | | | | | | Add attributes for reset() and null-check. The shared pointer in the test uses isNull() which works due to the --use-isnull-as-nb_nonzero option, but it should be possible to explicitly specify that. [ChangeLog][shiboken6] Attributes for reset() and null-check of smart pointers have been added. Task-number: PYSIDE-454 Change-Id: I22571eeb43f7f98b6a77b31066bf8daa681cb044 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit eef987d0faaf1122f191a6ad92343d98f197715d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* shiboken6: Add a test for operator nb_bool of smart pointersFriedemann Kleint2021-11-253-0/+22
| | | | | | | Task-number: PYSIDE-454 Change-Id: I849d0a855395846f7cbe9cd97685457627dfd1a2 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit df72cfdfffc00c74f542f27475d651f7c6d088fa)
* Examples: Fix the directory structure in widgets/effectsFriedemann Kleint2021-11-242-0/+0
| | | | | | | | | | Move the lighting example to its own directory. Task-number: PYSIDE-841 Change-Id: I98b197994eb7f4cd592ce3af81c82d233fab9293 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit f680ebe731c447010f91393f1d35719e1596b48b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Documentation: Fix most sphinx errors "Inline strong start-string without ↵Friedemann Kleint2021-11-236-20/+130
| | | | | | | | | | | | | end-string." Ensure characters following a formatting end are escaped by adding handling and some RST manipulators to class TextStream. Task-number: PYSIDE-1112 Change-Id: I167160cd18fd890d73e31738487d2c91e012196c Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 2cfe8433c861c3602e5e23af8d4fdfb6fd219f4d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* blurpicker example: Fix syntax error in pyproject fileFriedemann Kleint2021-11-231-1/+1
| | | | | | | | | | Amends ea3851cdaf7f13f62fe9ae23b96750cd70468294. Task-number: PYSIDE-841 Change-Id: Ifb022247e6867ce3e84b1b053e139125e984e4b5 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit b70f82fdf4a733448003ff692f2cbce149d275af) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* example_gallery: Improve error handlingFriedemann Kleint2021-11-231-5/+13
| | | | | | | | | | Print error messages about invalid JSON project files and decoding errors caused by binary files. Treat .jpg files as binary files. Change-Id: I3d40789fc4680c7f2918a7a23c3d4fcc98ce9f81 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit ab8d43efb06ad00f8be945efde7a11279eda44fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* libpyside6: Add a convenience function to convert a PyObject * to a QObject *Friedemann Kleint2021-11-233-16/+40
| | | | | | | | Task-number: PYSIDE-1709 Change-Id: I137d7fd3ac84f50bb6a799e27e07b7523d943812 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit a34622f8098d67c706148eac506460fc65a6401f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* scriptable: make it work by default on macOS, tooChristian Tismer2021-11-231-1/+1
| | | | | | | | | | | | | | | | Some platforms like Homebrew's macOS name the Python interpreter "python3", while others use "python" as the default name. In any case, it is correct to use the Python 3 version as default, because Python 2 is deprecated. The default now tries "python3" first and falls back to "python". Task-number: PYSIDE-1710 Change-Id: I8850b2c157d219e7785177f41425dca1c2144f99 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit a77c08a6512b079175d08ae1732b9f65c79b687f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add blurpicker exampleJaime Resano2021-11-2316-0/+308
| | | | | | | | | Ported from C++ Change-Id: Id18068e36ecfa26ab0312cfde2de1ba1c0773223 Task-number: PYSIDE-841 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit ea3851cdaf7f13f62fe9ae23b96750cd70468294)
* coin: Don't prepend /bin: to PATH on Linux hostsAlexandru Croitor2021-11-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Coin tried to prepend {{.Env.PYTHON3_PATH}}/bin: to PATH on Linux and macOS but there is no PYTHON3_PATH env var set in Linux's provisioning, which accidentally ended up prepending /bin to PATH. This causes issues in CMake where each directory in PATH is used as a potential CMAKE_PREFIX_PATH value (with the /bin stripped), changing the order of prefixes where packages are searched for. In particular, when cross-compiling, this would lead to looking for packages under the '/' prefix before the '/usr' prefix, which can cause issues if /lib is a symlink to /usr/lib, because include paths won't be resolved correctly anymore (different depth of directories). Make sure to prepend {{.Env.PYTHON3_PATH}}/bin: to PATH only on macOS and skip it on Linux hosts. Amends 4af4b4c23551b68d4b207c47054af21ec64e76bd Task-number: PYSIDE-802 Change-Id: Ia8a59d501f95733376f8538ba599e963dfb88506 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 5b6e13653509b821a36b473bb3a399304fe571a9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* setup.py: Package QtWebEngine resources from Qt's data dirAlexandru Croitor2021-11-225-3/+8
| | | | | | | | | | | | | The QtWebEngine resources are not necessarily in $qt_prefix/resources. On Linux, distro's might specify a different value for QT_INSTALL_DATA. Make sure to use that value. Change-Id: I5bed723de07d39d0bc72e7932161809150433037 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 2d3758754337c673e459dfafe7db20462fa7acb2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* signature: avoid false positives in .pyi importChristian Tismer2021-11-221-1/+1
| | | | | | | | | | | | | | The standard imports into .pyi files are computed with a regex that scans the source for the usage of such imports. Enhance the regex to avoid false positives. Task-number: PYSIDE-1675 Change-Id: If79c278c3da0b347bb09e9b9d662c9ca56ab5716 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit cff76d051133a5c8ff95f272134f7ee55f57bceb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* signature: improve error handling for embedded applicationsChristian Tismer2021-11-223-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Entering something like """ mainWindow.setPointer(None) """ crashes in an old version of scriptableapplication, which shows an omission in the signature interface. The error shows up whenever a builtin module cannot be imported. The error does not show up in PySide 6, because the module is declared as a builtin via `PyImport_AppendInittab`. * add registration of AppLib as a builtin (5.15) * insert builtin modules per default into the mapping module * simple recovery if a module cannot be found in sys.modules [ChangeLog][shiboken6] Error handling was improved for embedded applications and builtin modules are trusted as valid modules. Change-Id: I722212a52a5e3aae924f0b965578485ecaf185a9 Fixes: PYSIDE-1710 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 2149a45fddeedea317dccbfe5e5b14e13888e5c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Brush up the openglunderqml exampleFriedemann Kleint2021-11-223-11/+8
| | | | | | | | | | | | | | | | | - Use suffix-less RHI constants (see 23dbe3d6e0d3338812ad9f614028a6fdc5a54090). - Remove unneeded assignments - Add slot decorator - Streamline code Amends b31f0c37bdc78e939db2dfe3bd876eba47137a5c. Fixes: PYSIDE-1716 Task-number: PYSIDE-1034 Change-Id: Ib34be3642d3c2b5f3582889bdc5f0d8d7cebe007 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit e062c9d70b5560beccb696aa13d8d44e5a2332f8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Fix crash when connecting slot after disconnecting non-existent ↵Friedemann Kleint2021-11-191-2/+4
| | | | | | | | | | | | connection to same slot Add a null-check. Fixes: PYSIDE-1715 Change-Id: I0fc8c1b051b04eacd6bd75542ceaf9f23a825cab Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 360ef4e884db56e3cd228593bbc562727fbd41cd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Add a sequence protocol for QRegionFriedemann Kleint2021-11-193-1/+29
| | | | | | | | Fixes: PYSIDE-1714 Change-Id: I581e8088e25ab31afdfc6cd5a15c55a5b418ffdc Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 943aa9ef6fef7533a3566f230aaf878efe46725e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* libpyside6: Use isEmpty() instead of empty() for Qt containersFriedemann Kleint2021-11-192-4/+4
| | | | | | | Change-Id: I0e2f7164bd89ae75eb2aa1cb82adcfa317aea309 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit cd67ab30927eed01ad3f068309033edca0478a3a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* setup.py: Remove dead function prepare_sub_modulesAlexandru Croitor2021-11-191-37/+0
| | | | | | | | | | | | | | It was originally removed in the dev branch via 9c9b506f3b2cc64da6fbbef9f58ccec7ccfe4457 but was accidentally brought back with a 5.15 -> dev merge in 68ec9c643abf30cf22b9932ec82098cdebc08b98 Remove it again. Change-Id: I86d3be455e45feeb5fd08cba49ca0324a6a1a26d Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 554d28f8f2c6104aca88079e9c7999d30eaf629a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Remove old QtQuick registering codeFriedemann Kleint2021-11-191-53/+0
| | | | | | | | Task-number: PYSIDE-1709 Change-Id: Iea46ee2c8f4a7d9fd117a3a95adf5e379803a6eb Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit b725e07c499e0e065a44336fcf8fd8200961cb4f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* pysideqmlregistertype.cpp: Fix compilation with QT_NO_CAST_FROM_ASCIIFriedemann Kleint2021-11-191-1/+1
| | | | | | | | | | | Properly convert noCreationReason, preparing for moving the code into a library. Task-number: PYSIDE-1709 Change-Id: I795bf0be22e192cd8abeed628e1a545429acb9cd Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 84ab9d13b4f912f67afa4e3da13f3957051ddcc3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use legacy OpenGL option to build on linuxCristián Maureira-Fredes2021-11-191-0/+6
| | | | | | | | | | Fixes: PYSIDE-1547 Change-Id: I7ff4fe084c4121d5635479d5fd2ed9b6a9fa0df7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 35deefbc82892b7002913dc527e3403ae00f573c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Fix build against Qt 6.2.1Friedemann Kleint2021-11-161-0/+1
| | | | | | | | | | | | | | | Fixes: 6.2.1/gcc_64/include/QtQml/6.2.1/QtQml/private/qtqmlcompilerglobal_p.h:54:10: fatal error: QtCore/private/qglobal_p.h: No such file or directory Amends 346a4a86fc2d7064e44c0766dd08374d652cdcc1. Add an include path for the QtCore private headers. Task-number: PYSIDE-1709 Change-Id: I3189d4d9fe05e038634af1d0ef7bc66c16be7aab Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 15763626e56fb7d495f56e77e4c8f730f560e2f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add a QmlSingleton decoratorFriedemann Kleint2021-11-168-12/+95
| | | | | | | | | | | Add a simple decorator function that stores the type in a list for the QmlElement decorator to use singleton registration. Task-number: PYSIDE-1709 Change-Id: I075d583404bd60dc52b84c23a3d09e50d32a5a3a Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 671f9ed73ee174fe2ba96d7a1c2b267455ef367e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Fix documentation for QmlUncreatableFriedemann Kleint2021-11-161-8/+9
| | | | | | | | | | | | Add a blank line for code-block to work and fix the indentation. Amends a421aab61ad03afa595aa0ba7e53d84b1edbe892. Task-number: PYSIDE-1709 Change-Id: Idecb8a69b510191ab1ea27754d71eb94b2f6394a Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 3c17a00f5494dbbe87d7628d4a38e34560808fc0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PySide6: Fix warning in test registersingletontype.pyFriedemann Kleint2021-11-151-0/+1
| | | | | | | | | | | | Give the quickview a non-null size, fixing: QSGThreadedRenderLoop: expose event received for window QQuickView(0x1a31dc0 exposed, visibility=QWindow::Windowed, flags=QFlags<Qt::WindowType>(Window), geometry=0,0 0x0) with invalid geometry: QRect(0,0 0x0) on QScreen(0x1a0cf00, name=DVI-D-0) QSGThreadedRenderLoop: expose event received for window QQuickView(0x1a31dc0 exposed, visibility=QWindow::Windowed, flags=QFlags<Qt::WindowType>(Window), geometry=0,0 0x0) with invalid geometry: QRect(0,0 0x0) on QScreen(0x1a0cf00, name=DVI-D-0) Task-number: PYSIDE-1709 Change-Id: Ifed3d31943acf163cee879a2842823e01950c6fd Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 74fa311186c9355b43af7c4e6812d14e4fde332c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add a QmlUncreatable decoratorFriedemann Kleint2021-11-159-5/+311
| | | | | | | | | | | | Add a class type that stores the reason and registers the type in the call operator. This is then queried by the register type helper functions. Task-number: PYSIDE-1709 Change-Id: I0dd0c4c1e05e6e0ee6f22a6947b85546fc373fb9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit a421aab61ad03afa595aa0ba7e53d84b1edbe892) Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 23:01:30 +0000