aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* One more fix for the missing win runtime libs5.15.0Simo Fält2020-06-181-1/+5
| | | | | Change-Id: Ic430a687a6d7af7ba45df51a34c6fe7c56b3799d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add missing Win runtime dll into win wheelsSimo Fält2020-06-111-1/+2
| | | | | | Fixes: PYSIDE-1323 Change-Id: I2856c5388b66eb02b18004b894cac8db6c4be10a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Revert "Bump version number for fix release"Simo Fält2020-06-113-3/+3
| | | | | | | | This reverts commit a7de2e71219f89bbb46896c9bb9067449c706e50. There is no need to change the version, only wheel name. Change-Id: I4a77d4fcba2f0bb6ca0c57cda3f627c2d0809f82 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update vcredist binaries for MSVC 2019Simo Fält2020-06-101-2/+2
| | | | | | Fixes: PYSIDE-1323 Change-Id: If3a3d885f277044d64e174dd597974ad11a3425a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Bump version number for fix releaseSimo Fält2020-06-103-3/+3
| | | | | | | Also skipping patch level version test Change-Id: I9b41398340b812dddc83fb413e8fa3cb23439f75 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Cleanup version strings for 5.15.0 releasev5.15.0Simo Fält2020-05-262-4/+4
| | | | | Change-Id: I72802ab1fb0c2eb0ef49072d9b8e8e79188a3deb Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* shiboken: Fix invalid code generated for signatures with string default ↵Friedemann Kleint2020-05-262-16/+19
| | | | | | | | | | | | | parameters In the case of a default parameter with backslash escaping, wrong code can be generared. Factor out a helper function and generate signature strings as C++ raw string literals. Fixes: PYSIDE-1310 Change-Id: If7aa8e2449e959ce298da45a2977728823b25c2f Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Add changelog for 5.15.0Cristian Maureira-Fredes2020-05-261-0/+49
| | | | | | | | | | This was generated considering the changes from 5.14 up to 5.15 but removing the entries already mentioned in 5.14.1, 5.14.2, 5.14.2.1, and 5.14.2.2. Change-Id: Ieebc9303a2faacf6c76032d1dfd5e6082a058458 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Friedemann Kleint2020-05-261-0/+8
|\
| * Merge remote-tracking branch 'origin/5.14' into 5.15Friedemann Kleint2020-05-261-0/+8
| |\ | | | | | | | | | Change-Id: I2c93a1b20ce0f76460ca5c5a37cefb4d2c871a47
| | * update changelog 5.14.2.2Cristian Maureira-Fredes2020-05-261-0/+8
| | | | | | | | | | | | | | | Change-Id: Iff05110dbec9c6d09ca34526e70008d0c3a9c1c9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Add QtQuickControls2Cristian Maureira-Fredes2020-05-265-1/+92
|/ / | | | | | | | | | | | | | | | | This exposes the C++ class QQuickStyle Task-number: PYSIDE-487 Change-Id: I5776421070362d8b3bf9556eb28a410de3c90948 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | QtSerialPort improved unit testsAndreas Buhr2020-05-261-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | Support for QtSerialPort was added to PySide2 recently. However, only very few unit tests were added at that time. This change replicates a part of the C++ unit tests of QtSerialPort in PySide/Python. Change-Id: I7e7a1ee7a521b952a6c0860cd8cceacb3b0b7e57 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Friedemann Kleint2020-05-2627-66/+641
|\| | | | | | | Change-Id: I9c7163094bc934f481002adcea78ef4928ed26be
| * Add QtUiTools.loadUiTypeCristian Maureira-Fredes2020-05-253-0/+249
| | | | | | | | | | | | | | | | | | | | | | | | This function will allow users to convert and load .ui files at runtime. A test case was added. Change-Id: I64a220a07955e560f61f823d0ee2c3c9ff2209c1 Fixes: PYSIDE-1223 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix the no longer tested Py_LIMITED_APIChristian Tismer2020-05-222-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The limited API has always been tested in COIN. Not so last time when I checked this. I had a check-in which defined PyImport_GetModule for Python versions < 3.7, but did not see that this function does not exist when the Py_LIMITED_API is defined. The check-in should therefore have been broken, but it went through. That means that the Py_LIMITED_API is not tested, at least since commit c82ec2bc on 2020-05-18. Should we change the default, and how? Change-Id: I69ffaa1edeba9d7408c67f2cface8c4113ffcbe9 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * sbkenum: Fix refcounting leakChristian Tismer2020-05-183-16/+29
| | | | | | | | | | | | | | | | | | | | | | sbkenum had a wrong deallocator and some other errors. Found while developing pickling on enums. At the same time, a wrong Python 3.8 condition was removed. There are currently no additional bugs in Python 2.7, 3.7 and 3.8. Change-Id: I4abccf3b84a3738bba7781ea3dfd00e98ae63ea1 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Support pickling of Qt Enum objectsChristian Tismer2020-05-186-1/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pickling for types exists in most cases. Pickling of Qt Enum objects works fine. Pickling of Qt Enum types is supported, but does not work because the builtin type pickling intercepts and then fails.. This problem is now solved because PySide supports now __qualname__. So pickling of nested types works now without any extra code in Python 3. Python 2 is not supported since it would require too strange patches to Python itself. Fixes: PYSIDE-15 Task-number: PYSIDE-1286 Change-Id: I346bde07a63afcf2555a3324fcca04efe25e704a Reviewed-by: Christian Tismer <tismer@stackless.com>
| * PySide2: Fix conversion of quintptrFriedemann Kleint2020-05-182-2/+18
| | | | | | | | | | | | | | | | Ensure it is 64bit for 64bit systems. Change-Id: I0b4d54f2568bd70288e184a5a2d8f31532fed157 Fixes: PYSIDE-1303 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * libshiboken: Support musl libcFriedemann Kleint2020-05-181-1/+7
| | | | | | | | | | | | | | | | Patch as contributed on JIRA. Change-Id: I07303a3f09259ea5f76ee09505c61d6a45fbe81a Fixes: PYSIDE-1298 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * shiboken: Fix cross buildsFriedemann Kleint2020-05-182-2/+2
| | | | | | | | | | | | | | | | Patch as contributed on JIRA. Fixes: PYSIDE-1299 Change-Id: Ifbf94e59712cf16c0161da57691008f3895a64e3 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Implement __qualname__ and correct __module__ for classesChristian Tismer2020-05-1613-43/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PyType_FromSpec breaks the name "A.B.C.D" in module "A.B.C" and name = qualname = "D". We fix that for PySide: module = "A.B" qualname = "C.D" name = "D" and for other prefixes like Shiboken: module = "A" qualname = "B.C.D" name = "D" This had quite some impact on the signature modules. Change-Id: Ie94971ba737107b15adbfc2517e1ed32b65fda39 Fixes: PYSIDE-1286 Task-number: PYSIDE-15 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix imports: add missing sys importAndreas Buhr2020-05-151-0/+2
| | | | | | | | | | | | | | | | | | | | In line 128 of errorhandler.py, the sys module is used to check for Python 3. However, sys was never imported. Change-Id: I01b2ae41fe611de7e378b27bb3d73589dc4e4887 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit d6f37d6c2f5cc9be57569fd5b20d82660644c1b7) Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Rename pre_release_version_type to release_version_typeSimo Fält2020-05-254-9/+11
| | | | | | | | | | | | | | | | Renaming pre_release_version_type to release_version_type to match its future usage to differentiate between wheel/package types. Change-Id: I70a2361f639a36b17f63b7f76d8c231a144bd825 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Rename and update some snippetsCristian Maureira-Fredes2020-05-2523-774/+984
| | | | | | | | | | | | | | | | | | | | | | | | | | * Renaming a few .cpp files into .py * Replacing the use of SIGNAL() and SLOT() * Fixing Python syntax * Removing C++-isms from translated Python code * Including the snippets from QStackedLayout Task-number: PYSIDE-691 Fixes: PYSIDE-1309 Change-Id: I431be3d930b2adc36a22118901baa6799581adb2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | doc: add tutorial for using qrc filesCristian Maureira-Fredes2020-05-2211-2/+172
| | | | | | | | | | | | | | | | | | We currently have only a tutorial for .ui files, and the .qrc case was missing. Task-number: PYSIDE-841 Change-Id: Ic12e8e77cb1ee042bc118fab74c97b3f6ba54ff4 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | PySide2: Prepare for Qt 6Friedemann Kleint2020-05-192-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change QBasicTimer to be an object type since its copy constructor and assignment were deleted in Qt 6. It probably was never intended to be a value type. - Remove the hash function of QItemSelectionRange which according to code comment is a dummy to get QItemSelectionRange::toSet() compiled with MSVC. There is no need for it to have it in Python - Adapt the underlying string types for QString conversion Task-number: PYSIDE-904 Change-Id: Idb60b95b6bc0ce3d1272862995f3247d2f191454 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Refactor generation of sequence access methodsFriedemann Kleint2020-05-192-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename writeStdListWrapperMethods() to writeDefaultSequenceMethods() since that is is more close to its purpose. In the function, get the base container type. Use std::advance instead of a loop to position the iterator. This is specialized for random access iterators to perform an addition and thus more efficient. Use const_iterator in __getitem__ to prevent Qt containers from detaching. Task-number: PYSIDE-904 Change-Id: I4735f39193c4f4efa856440ecddbc48b3a5071ae Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Rename enum ContainerTypeEntry::Type to ContainerKindFriedemann Kleint2020-05-197-23/+28
| | | | | | | | | | | | | | | | As it is, it clashes with TypeEntry::Type. Task-number: PYSIDE-904 Change-Id: I51b269f188b39dc18412b83c3d659cbf61a99608 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Support non-type template parameters in functionsFriedemann Kleint2020-05-196-6/+62
| | | | | | | | | | | | | | | | | | Create dummy constant value type entries on the fly as is done for classes. Fixes: PYSIDE-1296 Change-Id: I7990a44d5bf32dbf4bf801e06eb1af655ab8f488 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Fix duplicated template parameters of functions with non-type ↵Friedemann Kleint2020-05-191-0/+2
| | | | | | | | | | | | | | | | | | | | template parameters Clear the instantiations in case clang parsing failed Task-number: PYSIDE-1296 Change-Id: Ia1e07d633f45338fc8f35efa46c752a62a51ad76 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Add a cast to Py_hash_t in the hash function generatorFriedemann Kleint2020-05-191-3/+6
| | | | | | | | | | | | Task-number: PYSIDE-904 Change-Id: I95449299f7e6f5b798b77e51aa63a2fb609bd443 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Add support for template type aliasesFriedemann Kleint2020-05-186-11/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | In Qt 6 as of May 2020, this is used to alias QList to QVector: template<typename T> using QList = QVector<T> which shiboken needs to handle. Introduce a new code model item for this and add it to the resolver. Task-number: PYSIDE-904 Change-Id: I9e558635e843b60d44c0ceaaaa68b09b50c25c9f Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Add an internal error when template instantiations are not foundFriedemann Kleint2020-05-181-1/+6
| | | | | | | | | | | | | | | | Happens in Qt 6 for QItemSelection. Task-number: PYSIDE-904 Change-Id: Id2463eeb046155615d3d356b3cf38b32cb5c15e5 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | pyside2: Prepare build system for Qt 6Friedemann Kleint2020-05-1860-395/+465
| | | | | | | | | | | | | | | | | | | | | | - Introduce a version variable to the CMakeLists. - Emulate the Qt5Core_INCLUDE_DIRS, Qt5Core_LIBRARIES variables by retrieving them from the INTERFACE - Raise the language level Task-number: PYSIDE-904 Change-Id: Ie4e43e7e6a9a2631d666038b80f306e2d9af47b1 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Fix duplicate base classesFriedemann Kleint2020-05-181-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | When adding the code model dumping functions, it was noted that base classes show up duplicated. Remove code snippet adding the base class again, which is apparently a remnant from before removal of the InterfaceTypeEntry, ba366999c39e864b2999e6df2693ced3dbe34046. Task-number: PYSIDE-1265 Change-Id: I80737a5fb7b3a4505d8ab89dda252ad8878e0418 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | doc: add more videos from Qt eventsCristian Maureira-Fredes2020-05-171-1/+66
| | | | | | | | | | | | Task-number: PYSIDE-841 Change-Id: I1d64fe659a7651a4da2f537368d19d731d5c1e54 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Add example contributions from Hacktoberfest 2019Cristian Maureira-Fredes2020-05-1511-1/+781
| | | | | | | | | | | | | | | | | | | | | | | | | | Adding examples contributed from Github. Thanks to the contributors: - María José Molina-Contreras https://github.com/mjmolina - Sabine Wolf https://github.com/Lythi45 - Meili Triantafyllidi https://github.com/mei-li - Elena Hirjoaba https://github.com/puskini33 Change-Id: I7abfc6149af2e02c947ab9f088af1d09492de5df Reviewed-by: Christian Tismer <tismer@stackless.com>
* | cmake: one module per line on the cmake macroCristian Maureira-Fredes2020-05-151-3/+31
| | | | | | | | | | | | | | | | | | To avoid conflicts when modifying the line every time we add a new module, we should write one-module-per-line. Change-Id: I7400004b7aebd6cc8c0b01c0e1abd82b597b67da Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | shiboken: Move wrapperName and type into GeneratorContextFriedemann Kleint2020-05-156-65/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a Type enumeration to GeneratorContext and add the wrapper name as a string. Overwrite creation function in ShibokenGenerator to add this. Remove unused wrapperName overloads. Use the wrapper name and type from the GeneratorContext where applicable instead of repeatedly running the check in shouldGenerateCppWrapper(). Change-Id: I52cace3ad165c2cd6c6ce718cec822abfb8ad8ce Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | shiboken: Prepare for extending GeneratorContextFriedemann Kleint2020-05-154-14/+28
| | | | | | | | | | | | | | | | | | Remove the constructor GeneratorContext and add creation functions to the generators. Make the class creation function virtual so that ShibokenGenerator can override it. Change-Id: I7bc002555356be73ddab5a2095802747796acb7e Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | shiboken: Use GeneratorContext in more functionsFriedemann Kleint2020-05-155-55/+99
| | | | | | | | | | Change-Id: Ief36279da5dfeeeacf83697d92b9f64680b2a56e Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | shiboken: Constify GeneratorContextFriedemann Kleint2020-05-158-77/+80
| | | | | | | | | | | | | | | | | | | | | | | | Pass around by const-ref and return a const pointer to the class. In HeaderGenerator::generateClass(), make a copy of the context passed in to prevent writing back via reference in the base class loop. Change-Id: I0338bd93b5a53c25ec18bc45b407ab67d8c7c91e Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | shiboken: Refactor ShibokenGenerator::wrapperName()Friedemann Kleint2020-05-153-18/+26
| | | | | | | | | | | | | | | | | | Assert that it is only used for wrapped classes and remove fallback path returning the class name, which obfuscates the code. Change-Id: I9af1a6a9edc5e566296ec99a50a9f8cfbe055cd0 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Use reference license header from correct branchSimo Fält2020-05-151-1/+1
| | | | | | | | | | Change-Id: I18b509769697459a70a2053d8ee00eb98b63da66 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix imports: add missing sys importAndreas Buhr2020-05-151-0/+2
| | | | | | | | | | | | | | | | In line 128 of errorhandler.py, the sys module is used to check for Python 3. However, sys was never imported. Change-Id: I01b2ae41fe611de7e378b27bb3d73589dc4e4887 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | example: add systray exampleCristian Maureira-Fredes2020-05-158-0/+2922
| | | | | | | | | | | | | | | | | | Adding an example with systray functionality, since we didn't have any in our repo. Task-number: PYSIDE-841 Change-Id: I7df67c55d38c1f98f9e4c28c82e6253bae494272 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | shiboken: Raise C++ default language level to C++ 17 for Qt 6Friedemann Kleint2020-05-151-2/+6
| | | | | | | | | | | | Task-number: PYSIDE-904 Change-Id: I4e85dd8706f5fbe708fca7c797e0225b5bac9377 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Add support for QSerialPortAndreas Buhr2020-05-156-1/+148
| | | | | | | | | | | | | | | | | | | | | | QSerialPort is part of Qt since Qt 5.1. PySide2 so far had no support for QSerialPort. At the same time, QSerialPort was not listed as unsupported. Task-number: PYSIDE-487 Change-Id: I88d4282a206dadf6f398c3f0e5740f02641724b6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Revert "Revert "Fix deprecation warnings about Qt::SplitBehavior""Friedemann Kleint2020-05-153-6/+6
| | | | | | | | | | | | | | | | | | Fix warnings in 5.15. This reverts commit 2ca788f85fbc9d58969533d13046bbe19f53fac8. Change-Id: Iaee39e2035f5e4ebdc9b5360a68a5f024f8bde38 Reviewed-by: Christian Tismer <tismer@stackless.com>