aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add QtOpenGLWidgetsFriedemann Kleint2020-07-143-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLWidget has been moved from QtWidgets into a separate library. Fix the examples and remove obsolete examples using deceased QGLWidget. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ib291d49c22ee6a32d7c03b6ff4980e87c8a09ecb Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Re-add QtOpenGLFriedemann Kleint2020-07-146-815/+158
| | | | | | | | | | | | | | | | | | Open GL functionality has been moved from QtGui to QtOpenGL in Qt 6. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Iecfc70d24bd694b09622554cc6b6762795243d5c Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Adapt to refactored pointer event hierarchyFriedemann Kleint2020-07-132-6/+7
| | | | | | | | | | | | | | Add/remove classes for qtbase/4e400369c08db251cd489fec1229398c224d02b4. Change-Id: I9494c7b191e5745ec8e31ada041ccadf87d3edf9 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-07-137-0/+565
|\| | | | | | | Change-Id: I509b55363c29639cd29bfbc012c4bda3a4d008e5
| * shiboken2: Re-add support for parsing Q_PROPERTYFriedemann Kleint2020-07-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | Following how qdoc does it, define Q_PROPERTY as a static assert with the stringified macro content in a ','-operator and parse it with clang. Task-number: PYSIDE-1019 Change-Id: Idcf53f1cd1c1cb29f4320444f446e9abad33d251 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com>
| * feature-select: Implement a selectable feature frameworkChristian Tismer2020-07-106-0/+558
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the framework for selectable features. There are no real features implemented. Planned is a maximum of 8 features. They are all implemented as a dummy for now. The decision depends of the following setting at the beginning of a module after PySide2 import: from __feature__ import <feature name> For more info, see the Jira issue, section The Principle Of Selectable Features In PySide Task-number: PYSIDE-1019 Change-Id: If355e9294b5c16090b39d30422a90ea9c8523390 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Fix QML registration in devMaximilian Goldstein2020-07-101-40/+37
| | | | | | | | | | | | | | Change-Id: Ifc0e6495b02577c7c8028ac3011cd4585de6df87 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix further testsFriedemann Kleint2020-07-077-67/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove bug_632.py which was testing removed function QLineEdit::getTextMargins() - Enable the qshortcut test - Remove check for QWidget::getContentsMargins() from returnquadruplesofnumbers_test.py - Adapt error message in qdomdocument_test.py - QByteArray: exclude overloads of number functions added by qtbase/66d6943478c3ae76f996c2cd2fdf04fee4fcb767. As a drive by, remove operator[](uint). Change-Id: I8f40dad1c1a446865e9de34a5df293cce09a1510 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-07-071-3/+0
|\| | | | | | | Change-Id: I299a65f15fb6b7eb900256590bbe76ad0568f546
| * QByteArray::number(): Remove non-existent exclusions of number()Friedemann Kleint2020-07-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | Fixes an oversight of 157e03911ba0e2e8fd74899702588296693fd4ab, causing: typesystem_core_common.xml:1792: signature 'number(ushort,int)' for function modification in 'QByteArray' not found. typesystem_core_common.xml:1792: signature 'number(float,char,int)' for function modification in 'QByteArray' not found. typesystem_core_common.xml:1792: signature 'number(short,int)' for function modification in 'QByteArray' not found. Task-number: PYSIDE-904 Change-Id: I31b22d12235398400bc7e7a01dd9520a45538446 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Revert "add wiki link to doc index"Cristian Maureira-Fredes2020-07-061-4/+0
| | | | | | | | | | | | | | | | | | This reverts commit a0a7b1fe8c976683832d0305e7e2cdf02faac928. Reason for revert: <INSERT REASONING HERE> Change-Id: I1c324373696bd6835185add5d51ff7d071a3a2ea Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Fix QQmlIncubationController::incubateWhile()Friedemann Kleint2020-07-063-23/+26
| | | | | | | | | | | | | | | | | | The bool * has been changed into a std::atomic<bool>. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ie64668e145e9233760610985dcb86cea68dfb1f3 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Remove QtWebKitCristián Maureira-Fredes2020-07-0629-1772/+0
| | | | | | | | | | | | | | | | Since it was deprecated in 5.5, it's time to remove it from the repository. Change-Id: I0835f04d6c34079dfc289be8027985a1dc3674bc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | add wiki link to doc indexJimmy Girardet2020-07-061-0/+4
| | | | | | | | | | Change-Id: I52f429fcc091d54b4eb409af121a1afa2f0dceae Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-07-035-2/+103
|\| | | | | | | Change-Id: I08bddaf2aa407e7499ce05832c9455ca09c1757a
| * qfontmetrics_test.py: Stop using deprecated APIFriedemann Kleint2020-07-031-1/+1
| | | | | | | | | | | | Task-number: PYSIDE-904 Change-Id: Ie69503e27d7cefc957c20c4eb1e618f03db1f771 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * QByteArray::number(): suppress small integer types as is for setNum()Friedemann Kleint2020-07-032-1/+15
| | | | | | | | | | | | | | | | Otherwise, overflow errors can occur. Task-number: PYSIDE-904 Change-Id: I42486a27bcdb8e7562d411b4519d2e61f315be1d Reviewed-by: Christian Tismer <tismer@stackless.com>
| * basewrapper.cpp: add PyErr_Fetch/Restore in SbkDeallocWrapperCommon()Kyle Altendorf2020-07-012-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes corruption of the interpreter's internal exception state which can occur for example in a final send to a generator which results in teardown of Python objects. Resolved by adding PyErr_Fetch and PyErr_Restore calls around the deallocation code in SbkDeallocWrapperCommon(). Task-number: PYSIDE-1313 Change-Id: Ie68c7b08d60eec8ca91b4032b21089d66d6e4478 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Initial port of Core,Gui,Widgets,Network,Qml,Quick to Qt 6Friedemann Kleint2020-07-0364-1091/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test failures: shiboken2:testmodifyfunction pyside2:QtCore::qbytearray_test pyside2:QtGui::bug_PYSIDE-41 pyside2:QtGui::deepcopy_test pyside2:QtGui::qfontmetrics_test pyside2:QtGui::qpixmapcache_test pyside2:QtWidgets::api2_test (QTBUG-85417) pyside2:QtWidgets::bug_632 pyside2:QtWidgets::bug_714 pyside2:QtWidgets::bug_785 pyside2:QtWidgets::qshortcut_test pyside2:QtQml::bug_825 pyside2:QtQml::bug_1029 pyside2:QtQml::registertype pyside2:QtQml::qqmlincubator_incubateWhile pyside2:QtQml::signal_arguments Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ia43d7ed037dfdd07def0edd76bada2243e73d335 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Remove pyside-toolsFriedemann Kleint2020-07-031-1/+0
|/ | | | | | | Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ice3fbbf2a47833d8bb8702b4b553c87df2d9757d Reviewed-by: Christian Tismer <tismer@stackless.com>
* CMake: Use the portable Qt feature propertiesFriedemann Kleint2020-06-303-4/+5
| | | | | | Task-number: PYSIDE-904 Change-Id: I15ebd4057c52c78d584de7c34e74ebb858cb0011 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Indicate limited API builds in QLibraryInfo::build()Friedemann Kleint2020-06-292-0/+13
| | | | | Change-Id: I55fe70da8adf6faba0f8099d4d127ae3963fa2c6 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Add QObject.findChildren(QRegularExpression)Friedemann Kleint2020-06-263-11/+20
| | | | | | | | | Replacing the deprecated QRegExp version in Qt 6. Merge identical code snippets. Task-number: PYSIDE-904 Change-Id: Id6f5c39379c65cf71fb6352531173d0fd7f2ae5e Reviewed-by: Christian Tismer <tismer@stackless.com>
* Change the return type of the hash functions to Py_ssize_tFriedemann Kleint2020-06-262-5/+5
| | | | | | | | | This is the proper type and makes it clear that it it is not related to Qt's hash type (uint in Qt 5, size_t in Qt 6). Task-number: PYSIDE-904 Change-Id: I4ce0f5c845c06e5dcd0ad9744a16a995017987ef Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Friedemann Kleint2020-06-262-1/+35
|\ | | | | | | Change-Id: I75984f35bcdeeeb3b6004a00670f1582ab522c1b
| * pthreads: Try to abandon the GIL in case a thread was terminatedFriedemann Kleint2020-06-262-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | When terminating a thread using QThread::terminate() via (pthread_cancel(), QThread::run() is aborted and the lock is released, but ~GilState() is still executed for some reason. Add a cancel handler to the thread which tells GilState to abandon the lock. Fixes: PYSIDE-1282 Change-Id: I70abd42b5a2afd49aaa8cc5e8be0a92ed63f49d3 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | PySide2: Add QByteArray::FromBase64ResultFriedemann Kleint2020-06-232-0/+8
| | | | | | | | | | Change-Id: I348bb01c52482059b6f6bfebcc1d15fb68b9b142 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | PySide2: Reject internal namespaces of QtFriedemann Kleint2020-06-234-0/+14
| | | | | | | | | | Change-Id: I0ef48ed4300037edcd357e167b6738d04ef5aaa4 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | PySide2/Qt 6: Fix warning about redefinition of QT_ANNOTATE_ACCESS_SPECIFIERFriedemann Kleint2020-06-221-3/+3
| | | | | | | | | | | | | | | | Move QT_ANNOTATE_ACCESS_SPECIFIER before first Qt include. Task-number: PYSIDE-904 Change-Id: I82b12a79174fad93e0c7ea260e5111b997c60995 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Further build fixes for Qt 6Friedemann Kleint2020-06-222-0/+7
| | | | | | | | | | Change-Id: I2463997f1eb2012cbbd0192a019ca57beaf55d5b Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | libpyside: Port away from deprecated QRegExpFriedemann Kleint2020-06-221-8/+10
| | | | | | | | | | | | Task-number: PYSIDE-904 Change-Id: I0280de35578f72ab4616170115c5afed9d6d7488 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Friedemann Kleint2020-06-191-4/+7
|\ \
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Friedemann Kleint2020-06-191-4/+7
| |\| | | | | | | | | | Change-Id: If40b0ab35cd2ad2bd0d982881094ce3dbf46ccf3
| | * Use pyside2-uic instead of uic for the loadUiTypeCristian Maureira-Fredes2020-06-161-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we deploy the pyside2-uic wrapper inside the bin/ directory of virtual environments, that takes care of using the 'uic' binary we ship with the wheels, which is located in site-packages/PySide2/. The current implementation of loadUiType, runs 'uic -g python' but for people without a Qt installation, it has no effect since 'uic' is neither in PATH, nor in the system. Using 'pyside2-uic' instead will solve this issue. Task-number: PYSIDE-1223 Change-Id: I2c801a16c9ff4faa5cf8711bd718a634f017e592 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | doc: Add widget styling tutorialCristian Maureira-Fredes2020-06-198-0/+288
|/ / | | | | | | | | | | | | | | | | | | Usage of the 'setStyleSheet' function and loading '.qss' files. Task-number: PYSIDE-841 Change-Id: I905025488c75cf379c7d77427da93d217169c604 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Implement the QEnum/QFlag decorator, V2Christian Tismer2020-06-1511-19/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implementation allows module-level and scoped QEnums which are Python enum types. Scoped types are registered in Qt's meta object system. Usage of QEnum/QFlag with decorator or function call: from enum import Enum, Flag, auto from PySide2.QtCore import QEnum, QFlag, QObject class Compass(QObject): @QEnum class Orientation(Enum): North, East, South, West = range(4) class Color(Flag): RED = auto() BLUE = auto() GREEN = auto() WHITE = RED | BLUE | GREEN QFlag(Color) Fixes: PYSIDE-957 Change-Id: Ie15f45cbd932c816b50724a96eee0c14ae1fdee8 Task-number: PYSIDE-487 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix crashes in QThread::wait(), QWaitCondition::wait()Friedemann Kleint2020-06-151-0/+3
| | | | | | | | | | | | | | | | Add allow-thread for the newly added overloads in 5.15 Fixes: PYSIDE-1332 Change-Id: I1e463203ea9914ae71991262745d803fc9001b7d Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Friedemann Kleint2020-06-112-1/+3
|\| | | | | | | Change-Id: I6cf604e1ae7234ce4f0d99169e9269a7dde07a4a
| * Fix leaking reference in PySide2 property getterFriedemann Kleint2020-06-091-1/+0
| | | | | | | | | | | | | | | | | | Remove Py_INCREF on result obtained from PyObject_CallObject() in getValue(PySideProperty*,*source). Change-Id: Ic070df29be0fd0eadcd37bc0210339205f957c8f Fixes: PYSIDE-1321 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Potential fix for deploying with cx_freeze using zip_include_packagesFriedemann Kleint2020-06-051-0/+3
| | | | | | | | | | | | | | | | | | In __init.py__, check for a zip archive and do not add DLL paths relative to it. Amends d9cfec8e010b48036e5e879ccc99879538a4f7d2. Change-Id: I18320bd6a8f784f20287c4a5ed65e9229989031c Fixes: PYSIDE-1257 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Fix some leaks in enumeration creationFriedemann Kleint2020-06-081-7/+7
| | | | | | | | | | | | | | | | Create the PyType_Spec on the stack. Task-number: PYSIDE-1321 Change-Id: Ie340dffe1915f99f81caec74432cff9359764001 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Clean the build/install output a bitCristián Maureira-Fredes2020-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * Adding STATUS or WARNING to a couple of message() calls. * Replacing some print() by log.info() * Changing some '*' by '-' * Align configuration outputs to check paths easily * Adding big message to check when shiboken2/pyside2 is being built. * Including the cmake_minimum_required() function instead of an 'if'. Change-Id: Idb6c5797286d400192d083403063e2ae582e3fe6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Doc: Add import statement for QIODeviceNico Vertriest2020-06-051-1/+1
| | | | | | | | | | | | Task-number: QTBUG-84270 Change-Id: If196369012fa740b90293ede2f7b2740657fbec9 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Add QSocketDescriptor classCristian Maureira-Fredes2020-06-053-0/+12
| | | | | | | | | | | | | | | | | | | | This was required by the change in QSocketNotifier in 5.15. Additionally, an alias, DescriptorType, was required to make the constructor to work. Fixes: PYSIDE-1317 Change-Id: Ib75e6024e467eb72f374a1179cb7416b1ea8a853 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | PySide2: Add QRegularExpressionValidatorFriedemann Kleint2020-06-052-0/+2
| | | | | | | | | | | | | | It replaces the deprecated QRegExpValidator. Change-Id: I18833a3f83bdaf2e72d05c529d846aa07582884c Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Doc: Fix a typo and a broken linkVenugopal Shivashankar2020-06-041-2/+2
| | | | | | | | | | Change-Id: Ic3515aea317d4b8e2d0286b60a5c3b68bd20bbdf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Doc: Enable doc builds using the offline templateVenugopal Shivashankar2020-06-0414-40/+2156
| | | | | | | | | | | | | | | | | | | | A new command-line option, --doc-build-online, enables to choose online builds, otherwise offline docs are built by default. Change-Id: I34ef8a22ef3bd321bd972c4f2873e4321c9c336a Fixes: PYSIDE-1292 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | docs: fix item list in tutorial/expensesCristian Maureira-Fredes2020-06-031-6/+6
| | | | | | | | | | Change-Id: I0f8d6784cfc567ac3a502df52e26413abec92a59 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Doc: Fix typo in the module pageVenugopal Shivashankar2020-06-021-1/+1
| | | | | | | | | | Change-Id: Icc09814ca6f8c08b6903f2b00fdd95812cfcd54a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Doc: Document QtUiTools.loadUiType functionVenugopal Shivashankar2020-05-282-25/+36
| | | | | | | | | | | | | | | | | | | | | | | | Removing the old inject-documentation approach from the typesystem, since the function lives in the module but does not belong to any class. Also some changes to the text were done, since there was a wrong statement regarding the PATH of uic. Change-Id: I7c8bf088f58ff9b6731ba66283ee384f6526c64b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>