aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Turn off numpy support in libpyside by defaultFriedemann Kleint2021-05-054-3/+15
| | | | | | | | | | | | | | | Add a configure parameter for it and mark it as experimental. It has been found to: - break cx_freeeze - Cause embedding applications to fail to load with "undefined symbol: PyExc_RecursionError" Task-number: PYSIDE-1540 Task-number: PYSIDE-1503 Task-number: PYSIDE-1455 Change-Id: I72fa4a3324a37eb996c42b83dce55fe1990b6fc3 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 36431b071095b8999347df87621bf23ffcc2ac3d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revert "Ensure Python libs needed by shiboken are not empty"Friedemann Kleint2021-05-051-14/+21
| | | | | | | | | | | | This reverts commit e664f7e525129c2ac356edecb2dd1255d93ad00a. It breaks the limited API build by linking to versioned python library. Change-Id: I14d7f7fa306f4f3bccebd4aa2e495daaca84b481 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit a7726c8ccc6e48b03cf33a864b9268e2d3de605d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update Qt6 dependencySimo Fält2021-05-041-1/+1
| | | | | Change-Id: Ie36d88fce01eae7735bbf10a9892126b34b67a0c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add changelog for 6.1Cristian Maureira-Fredes2021-05-041-0/+47
| | | | | | | Change-Id: Id4060de857a6f7a3dc0ae424e1fcade1c3bb0f27 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit ef59efdeb664a4459b3a6003e839c2cd88fbd152) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version numbers for 6.1.0Simo Fält2021-05-032-2/+2
| | | | | Change-Id: I370c0eb9433534b52df327986e448b1712e27a81 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* __feature__: Ensure that features are not affected by other importsChristian Tismer2021-05-032-7/+7
| | | | | | | | | | | Imports should not touch the feature dict unless they are feature imports. This was a small error in the import logic. Change-Id: I16045fffb4b770861ff2efba674667894e0798e5 Fixes: PYSIDE-1548 Pick-to: 5.15 Pick-to: 6.0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add a testing tool for uicFriedemann Kleint2021-05-011-0/+123
| | | | | | | Pick-to: 5.15 Task-number: PYSIDE-1404 Change-Id: Ie7722933b48228bd5a32c16a0c22f76f6dd37c6c Reviewed-by: Christian Tismer <tismer@stackless.com>
* Property: provide some hopefully exact documentationChristian Tismer2021-04-301-3/+70
| | | | | | | Task-number: PYSIDE-1513 Pick-to: 5.15 Change-Id: I5817869aaf495f4005c4fda92d15fceafb15600a Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Tests: Fix some space-related flake8 warningsFriedemann Kleint2021-04-29447-583/+1540
| | | | | Change-Id: I9b0ad08839bf1246620c557ec304dfa90882907b Reviewed-by: Christian Tismer <tismer@stackless.com>
* Enable running test with non packaging CI configsSimo Fält2021-04-291-7/+6
| | | | | | Change-Id: I269956d5daf5807098a8c9b547ab8631956fa921 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Add additional test configurations for ciSimo Fält2021-04-291-0/+8
| | | | | Change-Id: I7aef285a88182dfe5e5e9865226a8c3eaa5d9c17 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Examples: Fix some space-related flake warningsFriedemann Kleint2021-04-2971-106/+217
| | | | | | Task-number: PYSIDE-1112 Change-Id: Ib8991199e4822673d6a25cba0023dbe3b03f5938 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Test blacklist: Re-add macOS failuresFriedemann Kleint2021-04-291-0/+4
| | | | | | | | Partially revert 29edb488705c1498f67ff7c1958b27d617136da0, which was integrated without macOS checks. Change-Id: If74902a1944fc0bc106ab2f9d689a1235d075f1f Reviewed-by: Christian Tismer <tismer@stackless.com>
* doc: snippets_translate make quiet mode by defaultCristian Maureira-Fredes2021-04-282-27/+25
| | | | | | | | | | | | | | | | | Without being 'quiet' the script was generating output to the stdout and stderr, which was triggering the cmake instruction to make the build fail This change makes the quiet mode by default, the old output that summarize each snippet file can be obtained by using the '--verbose' option. A new option called '--debug' was introduced to get even more output related to each translation happening per file. Pick-to: 6.0.4 Change-Id: I7fce09f0b60e626c957efc4fe24948e0eaf3db74 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Tests: Use new form of super()Friedemann Kleint2021-04-2882-112/+112
| | | | | Change-Id: Id0a6c5e67f53623cc6d41ccc377218479931ee65 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Add context management for QSignalBlockerFriedemann Kleint2021-04-283-1/+17
| | | | | | | Add __enter__/__exit__ modeled after QReadLocker. Change-Id: I6e8f93adf4e957bd20179c902aa429fb88f2537b Reviewed-by: Christian Tismer <tismer@stackless.com>
* Examples: Use new form of super()Friedemann Kleint2021-04-28104-157/+156
| | | | | | Task-number: PYSIDE-1112 Change-Id: Ifcb4da974bdcad7af536404fffdbffc585d3d167 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Clean test blacklistFriedemann Kleint2021-04-281-65/+0
| | | | | | | Remove tests that pass by trial and error. Change-Id: Ia4a1ca5c25ba4cddc882a29c580edc7c1b1957d1 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Refactor class DocumentationFriedemann Kleint2021-04-287-62/+88
| | | | | | | | | | | | | | Replace the map by two fields of string type for detailed/brief and add accessors. Make the constructor explicit and fix all occurrences of implicit conversions. Change QtDocGenerator::writeFormattedText() to take a QString with the format instead of an instance of Documentation and add convencience functions writeFormattedBriefText() and writeFormattedDetailedText(). Change-Id: I4efaecc8cffeff16873fa3926c3f3b731b96bc5b Reviewed-by: Christian Tismer <tismer@stackless.com>
* PySide6/Windows: Fix encoding of QCoreApplication.arguments()Friedemann Kleint2021-04-273-0/+78
| | | | | | | | | Encode in the console's code page via wchar_t. Fixes: PYSIDE-1425 Change-Id: Ideae87361409a61919ea6bf8d5594609dceaa1cb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Tests: Use per-class importsFriedemann Kleint2021-04-2760-340/+396
| | | | | Change-Id: I6dac1f54152fecab7af6831bc3c813a016408aae Reviewed-by: Christian Tismer <tismer@stackless.com>
* Test bug_686.py: Fix warning about destroying a locked QReadWriteLockFriedemann Kleint2021-04-271-0/+2
| | | | | | | | | | Unlock in the threads, fixing warnings: QReadWriteLock: destroying locked QReadWriteLock QReadWriteLock: destroying locked QReadWriteLock Pick-to: 6.0 5.15 Change-Id: I484b7947fdcf241fca069c02ecd9e0ff7c20c151 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Tests: Fix star importsFriedemann Kleint2021-04-2773-118/+169
| | | | | Change-Id: If4e1d64af662b1802f2f748121bda5488a82235a Reviewed-by: Christian Tismer <tismer@stackless.com>
* UiTools: Remove dependency on QtXmlFriedemann Kleint2021-04-272-2/+0
| | | | | | | | The module only uses QXmlStreamReader/Writer. Change-Id: Icb58251dc800cc7c3cb8827b431ded1744baf639 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* PySide6: Fix the test HTTP serverFriedemann Kleint2021-04-271-1/+1
| | | | | | | | | | | | | | Change the test data to be a bytearray, fixing: File "sources/pyside6/tests/util/httpd.py", line 47, in do_GET self.wfile.write(TestHandler.DATA) File "/usr/lib/python3.8/socketserver.py", line 799, in write self._sock.sendall(b) TypeError: a bytes-like object is required, not 'str' Pick-to: 6.0 Change-Id: I5a0b5d0f76c4245fc7209d17a6c7f1e664cbc04f Reviewed-by: Christian Tismer <tismer@stackless.com>
* doc: fatal error when snippet conversion failsCristian Maureira-Fredes2021-04-264-8/+1558
| | | | | | | | | | | | | | | | | | | | | | When the snippets_translate tool fails, the build process continues normally, falling back to use the original C++ snippets. This problem can be dangerous, since we will not notice if something is wrong without checking the full log. This patch make the build process to fail when the tool doesn't exit normally. For builds where the documentation generation is skipped, this change will have no effect. Complementary to this, the patch includes a new Python file to determine if the C++ include have an import counterpart in Python. Fixes: PYSIDE-1527 Pick-to: 6.0.4 Change-Id: I725b623f60dbc540a6e7834502300c39cd22b5a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix the text object exampleFriedemann Kleint2021-04-231-35/+48
| | | | | | | | | | | | The example apparently has never worked. Fix it by using QPyTextObject as a base class and using a different character (as done in qabstracttextdocumentlayout_test.py). Modernize the code and use per-class imports. Task-number: PYSIDE-1112 Change-Id: Iceb6868afe752761820715c1ce68abc77b0a8011 Reviewed-by: Christian Tismer <tismer@stackless.com>
* shiboken6: Fix injecting documentation for added functions with parameter namesFriedemann Kleint2021-04-232-4/+28
| | | | | | | | Strip the parameter names from the modification signature so that it matches the C++ type signature. Change-Id: I8ca4e124e3c579d222d52f949f0d01b44eae92bf Reviewed-by: Christian Tismer <tismer@stackless.com>
* Remaining QGraphicsView examples: Use per-class importsFriedemann Kleint2021-04-233-308/+340
| | | | | | | | | As a drive by, fix breakages caused by removed APIs and oversights of the snake case change and wrap some long lines. Task-number: PYSIDE-1112 Change-Id: I09acdc7bb6f356964c859111ffd4643a97f5bdf6 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Remaining examples: Use per-class importsFriedemann Kleint2021-04-2319-718/+783
| | | | | | Task-number: PYSIDE-1112 Change-Id: I8534e911959d6eed2ed6d3f7741e99929ff0125e Reviewed-by: Christian Tismer <tismer@stackless.com>
* classwizard example: Use and generate super() without parametersFriedemann Kleint2021-04-231-8/+8
| | | | | | | | | | As a drive-by, add a missing comma. Amends 9a9f9fd2528c03df4b0e9dde48026a2181e8a410. Task-number: PYSIDE-1112 Change-Id: I5e7205609b460f56324a8ec193948250e6e38d6b Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Add documentation for the numpy overloads of functions taking point listsFriedemann Kleint2021-04-232-3/+15
| | | | | | | | | Amends 6389561fd75e80c69d7c83f6a87d988450a2e569. Task-number: PYSIDE-1540 Task-number: PYSIDE-1503 Change-Id: I0f424dccf4151d53d64f3aef923a32d3c3bf2641 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Brush up the dragdroprobot exampleFriedemann Kleint2021-04-221-64/+70
| | | | | | | | | - Use per class imports - Streamline code Task-number: PYSIDE-1112 Change-Id: I77f00a893b397d1cf73d85bb41038c7c4a73405c Reviewed-by: Christian Tismer <tismer@stackless.com>
* shiboken6: Fix XML errors when injecting target format (RST) documentationFriedemann Kleint2021-04-221-1/+1
| | | | | | | | | | In writeInjectDocumentation(), pass class Documentation (including format) instead of just the string to writeFormattedText() to prevent it from running through XMLToSphinx. Pick-to: 6.0 5.15 Change-Id: I6116552fc3ea8f7ddc1cc07d51370f868de97bb3 Reviewed-by: Christian Tismer <tismer@stackless.com>
* classwizard example: Update documentation and screenshotFriedemann Kleint2021-04-222-1/+1
| | | | | | | | Complements 9a9f9fd2528c03df4b0e9dde48026a2181e8a410. Task-number: PYSIDE-1112 Change-Id: If239fea81f5db505aaaf1fff2cd6d0b8ad7c98f9 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Rewrite the fetchmore exampleFriedemann Kleint2021-04-221-48/+77
| | | | | | | | | | | | | | | - Use per class imports - Start in root folder so that large directories (/bin/, Windows) are easily reachable - Remove the line edit and navigate by doubleclicking instead since this is more on line with expectations - Use a QPlainTextEdit for logging - Make the log message more informative - Add icons Task-number: PYSIDE-1112 Change-Id: I09663c40331df149cc15735f36f2553236759573 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Cannon tutorial: Brush up codeFriedemann Kleint2021-04-2214-630/+642
| | | | | | | | | | | | - Use per class imports - Remove string-based connections, fixing some errors introduced by the snake case renaming - Add some spacing and indent main - Use math.pi Task-number: PYSIDE-1112 Change-Id: I2171fc9eb27f9926f32648a289df404d390ace43 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Tetrix example: Use per class importsFriedemann Kleint2021-04-211-45/+45
| | | | | | Task-number: PYSIDE-1112 Change-Id: Ib60a1b5ac4cecd6b4152c8264e23a0258047a736 Reviewed-by: Christian Tismer <tismer@stackless.com>
* cmake: add dependencies to rebuild libshiboken embedded files, addendumChristian Tismer2021-04-211-0/+1
| | | | | | | | | | | There was one file forgotten when adding dependencies. This was recognized when back-porting the original change to 5.15 . Task-number: PYSIDE-1536 Change-Id: I5c396e8de47c716acb9e301d60930296bd530a64 Pick-to: 6.0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add a numpy overload for some functions taking lists of QPointFFriedemann Kleint2021-04-215-1/+47
| | | | | | | | | | | | | | | | | | | | Add functions taking x,y data in the form of numpy-vectors (as common for matplotlib, etc) for: QPainter::drawPoints() QXYSeries::append(), QXYSeries::replace() They are added as separate functions instead of overloads since there is a restriction in that numpy arrays cause an error: FIXME Subscripted generics cannot be used with class and instance checks when passed to other type check macros. Task-number: PYSIDE-1540 Task-number: PYSIDE-1503 Change-Id: Ie1521ce19127bb0641fbdb4f7320a8707682724e Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* libpyside: Add helpers for numpyFriedemann Kleint2021-04-214-0/+289
| | | | | | | | | | | | Add utility functions for converting numpy vectors containing x,y data to list of QPoint, QPointF, respectively along with helpers for type checking and initialization. Task-number: PYSIDE-1540 Task-number: PYSIDE-1503 Change-Id: Idde5084434a36ec31eb87bf65dec3d637cff728b Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Build system: Make numpy centrally availableFriedemann Kleint2021-04-213-23/+21
| | | | | | | | | | | In order to be able to use numpy in PySide6 modules besides libshiboken, move the numpy detection into the build scripts and pass it as a CMake variable. Task-number: PYSIDE-1540 Task-number: PYSIDE-1503 Change-Id: Ib30fdbab83904878286b7eaae1674ffba0f2febd Reviewed-by: Christian Tismer <tismer@stackless.com>
* signature: Refine the decision heuristics of result tuplesChristian Tismer2021-04-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | Result tuples do not (yet) get information from XML. Instead, they fetch their info solely from the embedded signature strings and information encoded in mapping.py . When a variable is determined as a result variable, it is removed from the arg list and normally appended to the return tuple. It turned out that a special rule is needed: A variable that comes first in the variable list should also be first in the result tuple. This heuristics should be replaced by more introspection. Right now, this suffices as a working fix. Fixes: PYSIDE-1409 Pick-to: 6.0 Pick-to: 5.15 Change-Id: Ib65682439e2f678380e0f58a42a36506d0766ddf Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* shiboken6: Refactor handling of the brief class documentationFriedemann Kleint2021-04-204-37/+41
| | | | | | | | | | | | Move the extraction of the brief text from the QtDocGenerator to the QtDocParser and store the brief text in class Documentation, allowing for later extraction. The handling for qdoc and doxygen should then be consistent. Pick-to: 5.15 Change-Id: I86b37ae1c4a92f96508a03f5dbcfb6dc56014382 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* PySide6: Call reserve() when converting listsFriedemann Kleint2021-04-201-0/+6
| | | | | | | | | | | If a size can be obtained, add a call to reserve() to avoid reallocations for large lists. Task-number: PYSIDE-1540 Task-number: PYSIDE-1503 Change-Id: I95a8a6aa02641d9f174dbc3b63740a05d1d95a45 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com>
* painter_test.py: Silence warnings about Painter being activeFriedemann Kleint2021-04-191-5/+14
| | | | | | | | Add QGuiApplication and let the painter paint on image, fixing: QPainter::setBrush: Painter not active Change-Id: I9f381e5b61c1798edaeb998be73f763aa4f2aff5 Reviewed-by: Christian Tismer <tismer@stackless.com>
* PyPy-compat: Avoid the __builtins__ quirk and import builtins, insteadChristian Tismer2021-04-191-3/+4
| | | | | | | | | | | | | The use of __builtins__ is an old wart of Python. In some contexts this is a dict, in others it is a module. PyPy treats it always as a module. Instead of using the implicitly existing __builtins__ dict, we now import the builtins module which never fails. Task-number: PYSIDE-535 Change-Id: I71d14a69051b177273be2ce542694221bf61add2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add changelog for 6.0.4Friedemann Kleint2021-04-191-0/+31
| | | | | | Pick-to: 6.0 Change-Id: Ifcbfacfa7a081e094919a0eb37dc616041c84917 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* doc: update cx_Freeze urlElisabeth Ortega2021-04-182-2/+2
| | | | | | Pick-to: 6.0 Change-Id: I9c1cb964e1b9a05f9940382d58ecdf820865d532 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* tools: display screenshot in example galleryCristian Maureira-Fredes2021-04-181-2/+28
| | | | | | | | | | | | | | Adding the option to display a screenshot on the example gallery. First, the script will look for an image with the same name as the example, otherwise it will just get the first in alphabetical order. Pick-to: 6.0 Fixes: PYSIDE-1490 Change-Id: Ia0328c84206a3d66854197abe5ecad8d1d28abc5 Reviewed-by: Christian Tismer <tismer@stackless.com>