aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2
Commit message (Collapse)AuthorAgeFilesLines
* Bump version numbersSimo Fält2019-12-031-1/+1
| | | | | Change-Id: Ifa5d9076653e377dbd7f5e4ca3f49e427fa0ee65 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Friedemann Kleint2019-11-299-117/+80
|\ | | | | | | Change-Id: Ie902334068eda21ed71934da56de168a9627e41d
| * Fix refcount issues with QSettings glue codeCristián Maureira-Fredes2019-11-281-4/+11
| | | | | | | | | | | | Task-number: PYSIDE-939 Change-Id: I5bda4e2025e31bf192bf0bf70c82aa626cd19714 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Merge remote-tracking branch 'origin/5.13' into 5.14Friedemann Kleint2019-11-285-4/+7
| |\ | | | | | | | | | Change-Id: I698090a9c9fdc995e00e39873aa35f8edda0f0b1
| | * Remove QGraphicsItem::scroll from QtCharts5.13Mariana Meireles2019-11-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing this method to avoid being inherit from QChart, so we don't have the problem of having two scroll methods with the same arguments and we don't call the wrong one. Change-Id: Ia98ae1fdea39bed4435869fae7e5d380a73e9d91 Fixes: PYSIDE-1101 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| | * Bump version numbersSimo Fält2019-11-111-1/+1
| | | | | | | | | | | | | | | Change-Id: I320da3f8bb09774db8c4e88c784a0d270eb1c932 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | docs: Propose new structure for overviewKavindra Palaraja2019-11-271-36/+4
| | | | | | | | | | | | | | | Change-Id: I4a946cc0373f986db422439b1796fdddbf0ae35b Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | docs: Clean up the PyInstaller topicKavindra Palaraja2019-11-271-66/+50
| | | | | | | | | | | | | | | Change-Id: I0d0668fd4270d58f2ab50bd14c9d7100ff906d3c Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | shiboken: Store the unqualified entry name in TypeEntryFriedemann Kleint2019-11-251-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the previous change adding a parent pointer, this is working towards building the target lang name by walking up the hierarchy, prepending the names, making it possible to exclude namespaces. Pass the unqualified name from the XML parser and build the qualified name in the TypeEntry constructor. For this to work, a new ConstantValueTypeEntry is added replacing the abuse of EnumValueTypeEntry for nontype-template parameters. As a side effect, it is no longer possible to nest types by qualifying with "::" in XML: <object-type name="Class"/> <enum-type name="Class::Enum"/> This needs to be fixed in the type system files. [ChangeLog][shiboken] As a result of a code cleanup, it is no longer possible to nest types by by qualifying with "::" in the type system files. The elements need to be properly nested. Task-number: PYSIDE-990 Task-number: PYSIDE-1074 Change-Id: I8a2f93c40d59167b0ba205ef3ff3b325d242c3d3 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Friedemann Kleint2019-11-2220-8/+8
|\| | | | | | | | | | | Change-Id: Id29d1bc3d4b1430afebaa8115049df482892f33a
| * | Replace imp by importlibCristián Maureira-Fredes2019-11-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Getting rid of the DeprecationWarning Change-Id: I86370c266d502fcd0fb61a9945770354b8f87142 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
| * | Doc: Drop PySide prefix from the RST filenamesVenugopal Shivashankar2019-11-1819-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shiboken appends the content in these RSTs to the module index pages that it generates. In addition, - updated the snippets, extras, and additional docs passed to the Shiboken call. - moved the copy_directory command right before the shiboken call. Change-Id: I45222ba7d0798105a764d7692d466f7a2a105d77 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Friedemann Kleint2019-11-142-0/+8
|\| | | | | | | | | | | Change-Id: Ia02c84b0afac228a713759719474be126161f9ae
| * | Simplify recreation of registry filesChristian Tismer2019-11-072-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The registry files were recreated when they do not exist. This was used to trigger recreation on a file. We now include a comment line on top of the files. #recreate # uncomment this to enforce generation By uncommenting this line, a NameError is provoked, which has the desired effect without creating huge deltas in the repository. Change-Id: Idcc1015abae504f111102e8c9851f8ef45dcbdff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Friedemann Kleint2019-11-04128-288534/+166412
|\| |
| * | PySide2: Enable a build for Qt built with -no-feature-sslFriedemann Kleint2019-11-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move QSslCertificate and QSslCertificateExtension out of the SSL branch since they are always present independently of -no-feature-ssl. Change-Id: I022d0f5e73b83f7a3c4774839e856734e17d0056 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * | Doc: Fix sphinx warnings about indentation and linkingVenugopal Shivashankar2019-11-0111-118/+149
| | | | | | | | | | | | | | | | | | Change-Id: I22fc8b60d9c9209224eddbd8255f8e2b834da0ae Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Revert "PySide2: Fix Qt3D events' modifier enumerations for 5.14"Friedemann Kleint2019-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build was broken after qt3d/a356d132b2a426ecd7edb7858245266433b3e855 was reverted by qt3d/7f3bba6e8a4a3bdb36f40a636b76c02902c09d02. This reverts commit 38f0302cc99292c8d8cbadbf64918b723d2f7f8d. Change-Id: Ic7fd3c7894d4cf48d3c6fcc57e5a18333a1571f5 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | Update the registry files after merging 5.13 into 5.14Christian Tismer2019-11-014-0/+162439
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge of certain changes into 5.14 had quite a few side effects, because the registry files had not been generated for 5.13 at all. When a simplification had the effect of generating more registry entries, the merge broke because we did not have these entries in the registry. The "obvious" but wrong assumption was that the simplification gives a problem in 5.14. But the truth is that by generating the files before the merge created too few entries, and that made it complain. A simple reset was the solution. We will try to further simplify the generation of new registry files without creating huge deltas. Change-Id: I680b3a1d3eeb4b981736ff6fe46857ee3135b735 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * | Make the scrape script robust enough, againChristian Tismer2019-10-311-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script scrape_testresults.py analyzes log files in order to find embedded script files for the registry. This script does not try to be absolute water-proof but handled the existing cases well. By chance, the text "BEGIN_FILE", which is used as an indicator, was found in a traceback from the generating script. We modified the search to ignore this text in single quotes, but also changed the originating file testing/runner.py to no longer contain this text in the future. Change-Id: I1fef1cf5e9b85fc94b7ee52edbdf4afa4bf4e35a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Friedemann Kleint2019-10-3116-80/+324
| |\| | | | | | | | | | Change-Id: I9f31a647fd9d4ad9c854a307f8b5df1be935354a
| | * Fix booleans and empty list cases in QSettingsCristián Maureira-Fredes2019-10-282-16/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the fix for PYSIDE-1010 there were two things that were not properly understood: 1. A special case for booleans was required, 2. When a list was detected, the split was wrongly creating a list with a '0' instead of an empty one. Additonally, due to the wrong treatment we couldn't notice if the value 0 was None, the number zero, or even false, so this patch amends the previous implementation to properly treat these cases. New test cases were added. Change-Id: I41d5387bb835cfa96f94e5577e993a4b87b303f0 Fixes: PYSIDE-1130 Fixes: PYSIDE-820 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| | * Doc: Use the exclude_patterns instead of exclude_treesVenugopal Shivashankar2019-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extras directory should be ignored by sphinx, otherwise we'll have duplicate module pages. The exclude_trees sphinx config is deprecated since the v1.0 release. The alternative for it is the exclude_patterns. Change-Id: I2fa8a0c3d8080bc838397091dfad950a97aa697e Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| | * Doc: Add the additional and the API ref pages to the toctreeVenugopal Shivashankar2019-10-254-54/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | The breadcrumb does not work as expected without these pages in the toctree. In addition, changed the module page links to use the :mod: directive instead of the :doc:. Change-Id: I0fc86ae0026375d4924b870c5e20c504aea3aed1 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| | * Add inject-code for QVideoFrame::bits()VaL Doroshchuk2019-10-252-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QVideoFrame::bits() returns uchar* which is not covered by conversion functions, added the same replacement as was done for QImage::bits(). It should return a buffer object to satisfy Shiboken::Buffer::checkType(). Fixes: PYSIDE-849 Change-Id: I33bdb13f3b892f325ccf3b1ef4bef59744b60f2d Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| | * Add support for __repr__ in QObject derived classesAndreas Beckermann2019-10-257-8/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently shiboken generates classes without __repr__ for QObject derived classes. However for all non-QObject classes that have an operator<<() for QDebug, it *does* add a valid repr implementation. Extend this behavior to QObject classes as well. In order for this to become more useful, also check for the indirection of operator<<(): If operator<<(QDebug, Foo*) is available, use the current non-value-type behavior, (i.e. provide cppSelf to operator<<()), but if operator<<(QDebug, const Foo&) is available instead, use the same behavior as for value-types, i.e. provide *cppSelf. This greatly increases the number of classes where operator<<() provides useful results. Also make sure to check for operator<<() in namespaces (recursively), not just at global scope. Change-Id: Ief9158455a25e332f07169f09692cafb8097078b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Release ownership in QAbstractVideoFilterWrapper::createFilterRunnableVaL Doroshchuk2019-10-241-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractVideoFilter::createFilterRunnable() is supposed to be called only from VideoOutput QML element when paint event is received, where the QML element takes the ownership of returned QVideoFilterRunnable object. Need to release the ownership, so Python will not delete the underlying C++ object. Fixes: PYSIDE-785 Change-Id: I041d9a43cafaf42d638778ea70b8a115276805b1 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | Fix the registry after mergingChristian Tismer2019-10-304-157295/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.13 we did not check the registry. By change https://codereview.qt-project.org/c/pyside/pyside-setup/+/278244 more functions are generated, which are not yet in 5.14 . By repeating the removal of that patch, together with the recreation of the registry files, we add by hand what the merge could not do automatically. This took quite a while to understand :-) "SharedPtr" and maybe other classes may create an infinite recursion via some "._gorg" property from the typing module for Python 2.7 . We simply skip that effect. Change-Id: I85568b08bb6ac87b5dbf6a2823e4a71f69f8b4ad Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | Improve the NumPy Support by iterablesChristian Tismer2019-10-305-19/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Working example, by overriding cppgenerator: >>> from PySide2 import * >>> QtCore.QUrl.fromStringList(("asd", "def")) [PySide2.QtCore.QUrl('asd'), PySide2.QtCore.QUrl('def')] >>> def func(lis): ... for thing in lis: ... yield thing ... >>> QtCore.QUrl.fromStringList(func(["asd", "def"])) [PySide2.QtCore.QUrl('asd'), PySide2.QtCore.QUrl('def')] Also working, by overriding shibokengenerator >>> QtGui.QMatrix4x4(func(range(16))) And all other QMatrix sizes as well: >>> QtGui.QMatrix2x2(func(range(4))) >>> QtGui.QMatrix2x3(func(range(6))) The PySequence cases seem to be quite completely covered. Supporting lists and QVector is not yet clear and needs more research. Note.. QtOpenGLFunctions is not tested at all and nothing works on macOS, segfault. Ignored for now! A simple numpy test shows how versatile this solution is. We now need to improve signatures and error messages to optimize the experience. Task-number: PYSIDE-795 Change-Id: I195cd46cf47c2eb83276fe48fce8e6070cf30fda Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | init_platform.py: Add missing importFriedemann Kleint2019-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Amends ec1121a8768ccdba1788f09ad3147b36b73e5cc2. Task-number: PYSIDE-795 Change-Id: I957420f961b2c7c1349c32522543c0d31d2d504e Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | Make the function registry more usable in Python modulesChristian Tismer2019-10-283-65/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was impossible to use the registry in other functions without many dependencies. The numpy support made it desirable to write new test functions which lead to this refactoring. Task-number: PYSIDE-795 Change-Id: I60bd78a8eaec95dcb4840645c76629b1ef2b50f9 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * | Properly nest types in type system filesFriedemann Kleint2019-10-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nesting types by specifying "::" currently works by coincidence (as long as no modifications or further elements apppear) since the lookup is mostly name-based. It might be removed in a follow-up step. Task-number: PYSIDE-990 Task-number: PYSIDE-1074 Change-Id: I43db8a25a192e94b6a6d51f78233c3526f719406 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | Qt3DAnimation: Add class QAbstractChannelMappingFriedemann Kleint2019-10-252-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: class 'QSkeletonMapping' inherits from unknown base class 'Qt3DAnimation::QAbstractChannelMapping' class not found for setup inheritance 'Qt3DAnimation::QAbstractChannelMapping' Change-Id: Ib9ff5d61d49eef158d71b9973cc4820a9754b2ce Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | Registry/init_platform.py: Output build informationFriedemann Kleint2019-10-241-4/+19
| | | | | | | | | | | | | | | | | | | | | Add Python version/build and Qt build to the header. Change-Id: I1cf39c4cb3663511087af737bbe2257038e19fb6 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Friedemann Kleint2019-10-2441-4/+2593
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14Friedemann Kleint2019-10-1841-4/+2593
| | |\| | | | | | | | | | | | | Change-Id: I04187b70448808519c92bbb46b09d58e8babc3b3
| | | * Doc: Minor fixes to the snippets and their orderVenugopal Shivashankar2019-10-163-2/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Idf0bc429373180bf4c512014255eb7f6c93bd891 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | | * Doc: Fix the broken download linksVenugopal Shivashankar2019-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The links were using the the wrong directive. Change-Id: I3bbb3262d96857b66fff7d273f475514f880cb7c Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| | | * Doc: Set up necessary infra. for example doc generationVenugopal Shivashankar2019-10-1510-1/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qdoc must be made aware of the .py and .pyproject file types to generate the example page. In addition, it needs the URL to the example on https://code.qt.io/pyside-setup.git to link. Change-Id: I824898831475b6fe3f66df0cd16df62a9301a69d Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| | | * Doc: Add Porting guide tutorialVenugopal Shivashankar2019-10-1529-0/+2443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving the content from this wiki page: https://wiki.qt.io/Qt_for_Python/Porting_guide Change-Id: Ic4ad03ccd5b65bdf08e27dbf045fe7528ec6cdb4 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | | Update CI registries and URL for scrape scriptCristián Maureira-Fredes2019-10-245-442/+17
| |/ / | | | | | | | | | | | | Change-Id: I0c2ebdfd91903f824851590112733025b93eb845 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Friedemann Kleint2019-10-081-0/+18
| |\| | | | | | | | | | Change-Id: Ibe15176ae36ea31bd1799d9bf8a39b57f9338ca0
| | * Fix bad shutdown effect on QApplication.instance()Christian Tismer2019-09-301-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When app = QtWidgets.QApplication.instance() is used before a QApplication has been created, the qApp code sees no qApp instance in C++ and assumes a shutdown. This patch keeps track of QApplication being created and behaves correctly on that aspect. It is still unsolved that QtCore.QObject.staticMetaObject gets deleted on a qApp shutdown, which is too much. I think this can be handled in another patch if at all, since the shutdown / recreate feature is undocumented and of little use. Change-Id: I140b6dba45f7cd337580373dbf72bc6d0a625fea Fixes: PYSIDE-1093 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | libpyside: Use new static stringsFriedemann Kleint2019-10-046-8/+134
| | | | | | | | | | | | | | | | | | | | | Initial-patch-by: Christian Tismer <tismer@stackless.com> Task-number: PYSIDE-1087 Change-Id: I5b4f0e70bc9b79dd4a4a545e97722ceba778ee53 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * | Enable the Function Registry for 5.14 finaleChristian Tismer2019-10-0119-287871/+157721
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This concludes the registry start for 5.14 with improved files. Old versions are removed, since the format has changed quite much. Task-number: PYSIDE-795 Change-Id: I3c5dc1480d1eecce4018e4b6a5856d7961fbef86 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Enable the Function Registry for 5.14 augmentedChristian Tismer2019-09-302-10/+39
| | | | | | | | | | | | | | | | | | | | | This patch fixes some small quirks and improves the scraping. Change-Id: Ia0366e2e29c833fe985353768de166fd538f0d24 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Speed: Avoid some repeated string constant initializationFriedemann Kleint2019-09-302-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a basic concept to avoid the repetition of string constant creation in Python by using helper functions returning static instances. There is currently no real shiboken finalization, so we postpone finalization until shiboken has one: - call the finalize_strings() function - build finalization for other stuff (all signatures etc) Initial-patch-by: Christian Tismer <tismer@stackless.com> Task-number: PYSIDE-1087 Change-Id: If3483ba91f719ee0472eb53583460ba35163bc9d Reviewed-by: Christian Tismer <tismer@stackless.com>
| * | Enable the Function Registry for 5.14Christian Tismer2019-09-284-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function registry was not enabled for versions greater than 5.12 . This is now needed, since the function registry will be used in the tests for the improved NumPy support. There were new cases of Python keywords touched by enums which had to be renamed. This was moved into the code generator instead of the runtime overhead. The formatting of the enums was rewritten and reports all enums now that can be found (also those which are copied into the parent class). The formatting of the function registry had not been used for a long time and had entries that showed the wrong number of subclasses. The usage of the registry was also simplified by using the full names of functions. They can now directly be accessed. Task-number: PYSIDE-795 Change-Id: I734f6811205f3c3528a911975677eb677fedd2dd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Friedemann Kleint2019-09-251-1/+2
| |\| | | | | | | | | | Change-Id: I27c0e49bf4768339ce62669085d9a62ffd9ecf5a
| | * libpyside: Fix compiler warningFriedemann Kleint2019-09-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the warnings formatting code in helper fillQtProperties() to what it was before, (since QByteArray propName is constructed from PyObject *key), fixing: format ‘%S’ expects argument of type ‘wchar_t*’, but argument 3 has type ‘PyObject*’ {aka ‘_object*’} [-Wformat=] Amends bff242cfd8a34dcf2848a8864732eb5bdf85dbf0. Task-number: PYSIDE-1019 Change-Id: I724c5eb698327b8b6474c895f1b149b08e729bd1 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 14:34:27 +0000