aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* shiboken6: Do not attempt to qualify braces specified as default valuesFriedemann Kleint2021-01-261-1/+1
| | | | | | | | | | "Qt::WindowFlags flags = {}" was mistakenly changed to "Qt::WindowFlags flags = Qt::{}" Pick-to: 6.0 Pick-to: 5.15 Change-Id: Ic160a220db56645f0f554863c0a0d5e92b1307dd Reviewed-by: Christian Tismer <tismer@stackless.com>
* shiboken6: Improve error messages of added funcsFriedemann Kleint2021-01-263-34/+48
| | | | | | | | Pass the innner message out so that it appears in the qFatal() message. Change-Id: Ib38d54de58647037204d76bc7c78fcb3bf82fca5 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* PySide6: Re-add QStateMachineFriedemann Kleint2021-01-2618-35/+768
| | | | | | | | | | | | The code was moved from QtCore into a separate library, QStateMachine, within the qtscxml repository. Re-add tests and fix examples. Task-number: PYSIDE-904 Task-number: PYSIDE-1482 Change-Id: I977b4835b3345fb342c369e4fdd92646118f7fda Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* CI: Enable macOS 10.15Simo Fält2021-01-251-3/+0
| | | | | | Pick-to: 6.0 Change-Id: I12f9fde5507b452f0624d53045ec808a56ea1c63 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* CI: Enable macOS 11.0Simo Fält2021-01-251-1/+1
| | | | | | Change-Id: If67e239033970a523a4f02eddf256705922bf710 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* shiboken6: Make more functions static using clang tidyFriedemann Kleint2021-01-2319-138/+162
| | | | | | | | | Apply the fix created by clang tidy' -wreadability-convert-member-functions-to-static warning with some manual correction. Change-Id: I394bd96881fa25dbcb7a725b79d10395fcbb8676 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Further clean up some warnings produced by Qt Creator's clang/clazy code ↵Friedemann Kleint2021-01-234-15/+16
| | | | | | | | | | | | | checkers - Remove unused variables - Fix potential memory leak in type system parser - Initialize return values - Use const ref to avoid copies - Integer conversions Change-Id: Ib84236d58849143e9ae6af0079985503b773bca3 Reviewed-by: Christian Tismer <tismer@stackless.com>
* shiboken6: Make Generator::moduleName() staticFriedemann Kleint2021-01-232-8/+11
| | | | | Change-Id: If8d1b8a6ef4782bf75320454509a4c4a343a52f8 Reviewed-by: Christian Tismer <tismer@stackless.com>
* shiboken6: Make cache of buildAbstractMetaTypeFromTypeEntry() staticFriedemann Kleint2021-01-234-29/+37
| | | | | | | | | The cache can then be used by all generators and buildAbstractMetaTypeFromTypeEntry() and some dependent functions can be made static. Change-Id: Ied8e683f20fe80915d3c81fffb4b39a80c7cd0d5 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Disable Big Sur from CI until all dependencies are installedSimo Fält2021-01-221-1/+1
| | | | | Change-Id: I7f887a19b942f140fb01999950392e24434c68db Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* shiboken6: Add missing break statementsFriedemann Kleint2021-01-221-0/+2
| | | | | | | | Fix an oversight of 6a1a08cfaf11ad38612e59cb1d56160160504ec8. Pick-to: 6.0 Change-Id: Iba09b4c631132f7c50ab6b2321b9e93a61c26650 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Documentation: Fix creating inheritance diagramsFriedemann Kleint2021-01-221-1/+1
| | | | | | | | Amends d9f344fcef6bec04a787f9ea9f4ea94f15eaa26c. Pick-to: 6.0 Change-Id: I14a440c8372b5d0e418161c593bf9093f9010665 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Clean up some warnings produced by Qt Creator's clang/clazy code checkersFriedemann Kleint2021-01-2112-32/+16
| | | | | | | | | | - Remove unused variables - Remove assignments that do not have any effect - Fix mixing const/non-const iterators - Fix for loops, use const ref and/or qAsConst() Change-Id: I4b52f11030493c440026b194f18ec0151a3ea710 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* signature: Provide fixes and improvements, Part 1Christian Tismer2021-01-218-35/+50
| | | | | | | | | | | | | | | | | | | | The signature module is modified again to be more correct when using the mypy application. This part splits some changes which occurred when working on Shiboken.Enum inheritance. There will be a number of follow-ups: - signatures for all shiboken types - test cases for signatures - signature support for different __feature__ selections Change-Id: Ifb0d92bf7641f2909ab950e3458b3c3c68c20dad Pick-to: 6.0 Pick-to: 5.15 Task-number: PYSIDE-510 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* shiboken6: Make more generator functions staticFriedemann Kleint2021-01-217-50/+55
| | | | | Change-Id: Ief8aa743f47216e728a241a7cd4de360271c5568 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* shiboken: Provide the correct inheritance for enum typesChristian Tismer2021-01-214-50/+88
| | | | | | | | | | | | | | | | | | | | | Originally, it was planned to follow a competitor and derive enums from int objects. But this was abandoned in favor of Python Enums. We therefore simply leave most code as it is and only insert a Shiboken::Enum class that accepts an optional integer. This class is published by shiboken with signature. Derived classes still have no signature themselves, but they all inherit from this known class Enum. This is intentional to avoid creating useless signatures for every derived Enum. A test was included. Change-Id: Ifaaea40a4ddf2337e565fb57e6a69b7cc9a6040f Fixes: PYSIDE-1347 Pick-to: 6.0 Pick-to: 5.15 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* shiboken6: Enable setting clang optionsFriedemann Kleint2021-01-2010-13/+93
| | | | | | | | | | | Add command line options --clang-option, --clang-options to be able to pass options. Allow for a complete replacement of the built-in compiler support options by specifying '-' as the first option. Task-number: PYSIDE-1477 Change-Id: Ibcb107e5d0c4dedb56ab07e83af4203f0f682850 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Update to Qt 6.1Friedemann Kleint2021-01-203-0/+5
| | | | | | | | | - Add enum QJSValue::ObjectConversionBehavior - Add new classes of Qt3DAnimation Task-number: PYSIDE-1482 Change-Id: I9330470411e84558626518d23940e3b3f06893a3 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Fix building against a Qt developer buildFriedemann Kleint2021-01-201-4/+1
| | | | | | | | | | | | Remove redeclarations of QPyTextObject::drawObject(), QPyTextObject::intrinsicSize() which should be taken from QTextObjectInterface, fixing: sources/pyside6/PySide6/qpytextobject.h:58:10: error: ‘virtual void QPyTextObject::drawObject(QPainter*, const QRectF&, QTextDocument*, int, const QTextFormat&)’ can be marked override [-Werror=suggest-override] sources/pyside6/PySide6/qpytextobject.h:60:12: error: ‘virtual QSizeF QPyTextObject::intrinsicSize(QTextDocument*, int, const QTextFormat&)’ can be marked override [-Werror=suggest-override] cc1plus: all warnings being treated as errors Change-Id: I904ee7b66b738438f96cdaa8a934a10c4fe7d5a6 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* shiboken6: Refactor options parsingFriedemann Kleint2021-01-205-85/+110
| | | | | | | | | | | | Replace the string map in the CommandLineArguments struct by a QVariantMap, which can store strings and string lists. A number of list split and join operations can then be removed. Replace the path splitter by QDir::listSeparator(). Task-number: PYSIDE-1477 Change-Id: I70b798e531787d4932605ed5121b523fff5c1110 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* shiboken6: Refactor parsing project filesFriedemann Kleint2021-01-201-22/+26
| | | | | | | | | | | Use a std::optional<CommandLineArguments> as return value. An error can then be distinguished from an empty map. Add error handling for failing to open a project file which was previously ignored. Task-number: PYSIDE-1477 Change-Id: I69fa5e149818c8186755810c013232aa40d03dd9 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* shiboken6: Fix parsing of project filesFriedemann Kleint2021-01-201-1/+1
| | | | | | | | | | For key/value pairs specified without space after '=', the key would be truncated. Pick-to: 6.0 Pick-to: 5.15 Change-Id: I154b1685ca8aab2f13fb916290cde17bc972afea Reviewed-by: Christian Tismer <tismer@stackless.com>
* shiboken6: Use initializer lists for option descriptionsFriedemann Kleint2021-01-203-82/+81
| | | | | | | Task-number: PYSIDE-1477 Change-Id: I9d5734c96824ff40360d6a4197ed8bb69c09cb0b Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* QtCharts: Remove namespaceFriedemann Kleint2021-01-2015-381/+386
| | | | | | | | | Adapt to 227020b118fa38ada1d8bd579593dae61f6e3881. Task-number: PYSIDE-904 Task-number: PYSIDE-1482 Change-Id: I9adb78cfe60efd0df73be52132b4ea029986ea18 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Add mirror url to download MSVC redistributablesSimo Fält2021-01-201-1/+6
| | | | | | | Pick-to: 5.15 Pick-to: 6.0 Change-Id: If990cb45c2187cdfda5c41ea8b8123d803fa8934 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* examples: add example with arguments parameter in SignalMaxime Roussin-Bélanger2021-01-183-0/+151
| | | | | | | Pick-to: 6.0 Change-Id: Ib6f19b5bad1644fb5eb062a5cbe512db2f2a8adc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* qp5_tool: Add warning when the configured python binary is not under virtual envFriedemann Kleint2021-01-181-5/+16
| | | | | | | | | | | On Windows, the virtual env needs to be created by the debug binary python_d.exe in case of debug. When changing the configuration to release, it can happen that the system binary is used, which will then install to the system Python and cause strange errors. Change-Id: Ie3faf5d5f6a4cee3faec066f45cb3c6cbba416f5 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Prepare the wiggly widget example for use in DesignerFriedemann Kleint2021-01-114-30/+83
| | | | | | | | | | | | | Refactor and brush up the code to C++/Python naming conventions. Turn text/running into properties. Most importantly, fix it to not crash when the text initially is empty. Task-number: PYSIDE-1455 Task-number: PYSIDE-841 Change-Id: If94558a453b1824ba54bd4f94808ced5798b2dc3 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Revert "Replace _ARCH_ by 64/32bit in LLVM_INSTALL_DIR"Friedemann Kleint2021-01-113-18/+0
| | | | | | | | | | | | | | This reverts commit c3fc507d3b2a502273bd92472e1e7aa459c2d13e. 29be13664858cdb7ed7cbc02d6ad496bf57a9bbd moves this handling to the coin scripts, where it belongs. Some functionality was already removed by e44e21f14d8b10b1832c5db5459bf26f287ab6e8. Task-number: PYSIDE-431 Change-Id: I7474ea17230e484a53019eb7575d3dd9839e9263 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Windows: Fix running the example tests in COINFriedemann Kleint2021-01-113-2/+16
| | | | | | | | | | | | | | Move the logic expanding the Clang-related variables introduced by c3fc507d3b2a502273bd92472e1e7aa459c2d13e to the COIN scripts since they are needed when building the sample binding. c3fc507d3b2a502273bd92472e1e7aa459c2d13e should then be reverted. Task-number: PYSIDE-431 Change-Id: I1f118fdbd8989b7b9e3d24a249af81f4020c73f3 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 01b1d3218d70d128fe6c2f2ce3e6dce74608adaa) Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* allow to use shiboken.delete() to delete Q*ApplicationChristian Tismer2021-01-117-9/+46
| | | | | | | | | | | | | | | | | | | | This function should initially not allow deleting Q*Application with a shiboken.delete() function, but unfortunately some competitor can do that, so we will as well. Deletion of qApp needs knowledge about qApp. We add a hook function that calls the pyside function `destroyQCoreApplication`. A special problem was testing interactively. See the error description for the days long journey :) Change-Id: I34862425c2cb2cc80d6cafc22d25a867f96f3e0a Fixes: PYSIDE-1470 Pick-to: 6.0 Pick-to: 5.15 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* PySide: write a renamer script for debuggingChristian Tismer2021-01-112-0/+122
| | | | | | | | | | | | | | | Debug output is hard to read if there are many objects with the same type but different address. This script builds simple names instead of addresses which are easy to track. See the info at the beginning of the script. Change-Id: I51e08276d8ffc6d7365ce8620957e64769d7fd8c Task-number: PYSIDE-79 Task-number: PYSIDE-1470 Pick-to: 6.0 Pick-to: 5.15 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* qp5_tool: Add verbose optionFriedemann Kleint2021-01-111-2/+9
| | | | | | | | | | Add an option that cause the --quiet option to be removed from the build arguments specified in the configuration file. This removes the need to change the configuration file to temporarily enable cmake messages for debugging cmake issues. Change-Id: Ib57fa95d730e2c984aea36234a5cdc8e8fb88703 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Ensure Python libs needed by shiboken are not emptyFriedemann Kleint2021-01-111-21/+14
| | | | | | | | | The libraries were empty on Linux, causing the Designer plugin to not load due to missing python dependencies. Task-number: PYSIDE-1455 Change-Id: I4ccc7513bf45396fedc4e019eb425d2a956d0dfa Reviewed-by: Christian Tismer <tismer@stackless.com>
* shiboken2: Add diagnostic output to clang include searchFriedemann Kleint2021-01-111-1/+6
| | | | | | Pick-to: 6.0 Change-Id: I6c1063cf94ec790ad34d8edaee8d524b8fb28ed8 Reviewed-by: Simo Fält <simo.falt@qt.io>
* sources: migration from format() to f-stringsCristian Maureira-Fredes2021-01-0658-146/+146
| | | | | | | | | This should be the last patch related the usage of f-strings from the 'sources' directory. Pick-to: 6.0 Change-Id: I0288d720dc4930dee088ca3396a66d1b3ba18f76 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* feature: Disable selection while creating a typeChristian Tismer2021-01-065-4/+24
| | | | | | | | | | | | | | | | | | | PySide 6 suddenly has problems with feature switching during subtype initialization. We introduce an enable function that can temporarily suppress switching. This problem is solved so far. It is the question whether this will break again in another constellation. It might be considerable for the future to have something like Python's PyType_Ready function. Right now this is too much effort. Change-Id: If0ed786d4761cf2356f01f7478e4a0d750e88d3c Fixes: PYSIDE-1463 Pick-to: 6.0 Pick-to: 5.15 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* scriptable application: Actually make the generated module availableFriedemann Kleint2021-01-062-10/+8
| | | | | | | | | | | A call to PyImport_AppendInittab() before Py_Initialize() is required to be able to import the module. Previously, the example would only add the instance of the mainwindow under the "__main__" module. Pick-to: 6.0 Task-number: PYSIDE-841 Change-Id: Ib87ddd9fa9e4dbdcf413abe1d9e6273811fc414c Reviewed-by: Christian Tismer <tismer@stackless.com>
* shiboken6: Guard against repeated invocation of the module init functionFriedemann Kleint2021-01-051-1/+6
| | | | | | | | | | | It cannot entirely be avoided in the case of the scriptable application example. Generate code checking on the global variable. Pick-to: 6.0 Task-number: PYSIDE-487 Change-Id: I12bcd9df37c39f78f1d7edc63e16b3c6a9525011 Reviewed-by: Christian Tismer <tismer@stackless.com>
* scriptable application/Unix: Remove setting of PYTHONHOME for virtualenvFriedemann Kleint2021-01-051-3/+1
| | | | | | | | | | | | | On Linux, with 3.8, it causes an error in conjunction with virtualenv: Fatal Python error: init_fs_encoding: failed to get the Python codec of the filesystem encoding Python runtime state: core initialized ModuleNotFoundError: No module named 'encodings' Pick-to: 6.0 Pick-to: 5.15 Task-number: PYSIDE-841 Change-Id: Ibf1caa1a797faab5dd8e4bfa6eb23296bb7945a5 Reviewed-by: Christian Tismer <tismer@stackless.com>
* QSetting.value add overload documentationCristián Maureira-Fredes2021-01-051-0/+21
| | | | | | | | | | | | | | | When the new overload to specify a new "type" parameter was included, there was no documentation that could be reflected in our API docs. This adds a paragraph/example for the overload introduced by 78dad8180d797a647645b74255bfc29c46d7264a Fixes: PYSIDE-1466 Pick-to: 6.0 Pick-to: 5.15 Change-Id: I843e650f8eb4c32f4c67a31ed5cf9047c4f171f9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Revert "Qt CI: Install libCLang 10.0"Simo Fält2021-01-053-70/+0
| | | | | | | | | | LibClang with dynamic libs is now provisioned with Qt5 scripts. So this is no longer needed. This reverts commit cbe5ac758c59f4d16b64704a1c5a3ddf88f3f85b. Pick-to: 6.0 Change-Id: I1ca354e14231d677a72fc4d8391a705e70d28f35 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build_scripts: remove unused codeCristian Maureira-Fredes2021-01-051-8/+1
| | | | | | | | | | | | The function was removed in 609b1cd7ab8514354c93249e8a295e5e907d8de9 because CMake is in charge of discovering the location via llvm-config. This removes the code and raise a OSError if LLVM/CLANG_INSTALL_DIR is not defined. Pick-to: 6.0 Change-Id: Ifb74b9eb327518dbc7b114e6868b773f304a577e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* tests: remove old files and rewrite python 2Cristian Maureira-Fredes2021-01-0517-110/+1
| | | | | | | | | | | Some utilities from the tests directory were still around, and are not currently used. Additionally, there were still some old non active tests with Python 2 directives; updating them in case we reactivated them. Pick-to: 6.0 Change-Id: I24aff3396041aa780dab94e70793cb62adea2b3c Reviewed-by: Christian Tismer <tismer@stackless.com>
* testing: solve flake8 warningsCristian Maureira-Fredes2021-01-057-55/+51
| | | | | | Pick-to: 6.0 Change-Id: I75f1a367c8a86ec586820bd4a45339773c15a70a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build_scripts: fix get_config_var for Big SurCristian Maureira-Fredes2021-01-051-1/+2
| | | | | | | | | | get_config_var(...) returns an integer so the split fails. Pick-to: 6.0 Fixes: PYSIDE-1469 Change-Id: Iadf76c523dfca78c8b8d85511d06dc366de6273f Reviewed-by: Christian Tismer <tismer@stackless.com>
* doc/tests: update old style printCristian Maureira-Fredes2021-01-0434-88/+88
| | | | | | | | | There were some leftovers from Python 2 still around our code, this patch only covers the 'print' cases. Pick-to: 6.0 Change-Id: Icf574be6a40cdb233d3c410c2ec831d2d09bb735 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* build_scripts: use f-strings instead of format()Cristian Maureira-Fredes2021-01-0410-232/+215
| | | | | | | Pick-to: 6.0 Change-Id: I165e9a39f968f67f9eae3a632739908d5f8fda59 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* basewrapper: clear all traces of special Q*Application treatmentChristian Tismer2021-01-049-189/+49
| | | | | | | | | | | | | | | | | | After simplifying qApp so much, it is no longer necessary to treat Q*Application special. We now can allow garbage collection for all objects which simplifies the code quite much. Then it was easy to shrink the implementation to a single function `MakeQAppWrapper`, which made the whole "qapp_macro" files no longer necessary. This cosmetic change will probably not be back-ported to 5.15 . Task-number: PYSIDE-1447 Change-Id: I8ae3c5575e62bd7b5d6bac65c25775c712bb178f Pick-to: 6.0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* qp5_tool: use f-strings instead of format()Cristian Maureira-Fredes2021-01-041-10/+10
| | | | | | | Pick-to: 6.0 Change-Id: If6b472d5abbdc1018790c447532453a2fe956eed Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 23:30:16 +0000