aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-07-249-27/+453
|\ | | | | | | Change-Id: Ib38f2f4be9f214df79454ff972ccd20fbfc6d1cd
| * feature-select: allow snake_case instead of camelCase for methodsChristian Tismer2020-07-247-25/+450
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the implementation of the first of a series of dynamically selectable features. The decision depends of the following setting at the beginning of a module after PySide2 import: from __feature__ import snake_case For more info, see the Jira issue, section The Principle Of Selectable Features In PySide The crucial problems that are now solved were: - it is not sufficient to patch a type dict, instead the whole `tp_mro` must be walked to rename everything. - tp_getattro must be changed for every existing type. This is done either in shiboken by a changed PyObject_GenericGetAttr or PyObject_SenericGetAttr, or in the generated tp_(get|set)attro functions. An example is included in sources/pyside2/doc/tutorial/expenses. Task-number: PYSIDE-1019 Change-Id: I5f103190be2c884b0b4ad806187f3fef8e6598c9 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Test signal_arguments.py: Use Qt Quick Controls 2Friedemann Kleint2020-07-232-2/+3
| | | | | | | | | | | | | | | | | | Qt Quick Controls 1 is deprecated and has been removed in Qt 6. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: If70fde907c3984b0593186a9b570a921f270d45c Reviewed-by: Christian Tismer <tismer@stackless.com>
* | doc: Add docs for qmlRegisterUncreatableTypeMaximilian Goldstein2020-07-241-0/+36
| | | | | | | | | | | | Change-Id: I8d46f4f6b82639b417a146a81f84888ce363d5d4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | doc: add qmlRegisterType and qmlRegisterSingletonTypeCristian Maureira-Fredes2020-07-243-30/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | when the inject-documentation tag is used inside a namespace or module instead of class, it does not properly work. With this workaround, the data will be rendered on the online/offline documentation. Task-number: PYSIDE-691 Change-Id: I832f43cb1ffba9294a2e282ba002ce4aff07e253 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | PySide2: Add qmlRegisterUncreatableType()Friedemann Kleint2020-07-248-15/+100
| | | | | | | | | | | | | | | | | | | | | | Extend the Quick register helper function by the bool creatable and string noCreationReason parameters, extract a QML helper taking the same parameters and add the overload. Task-number: PYSIDE-574 Change-Id: I955dbd158c7b22d2637bbac464937f9fda6d7901 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Fix comparison of classes inheriting QListFriedemann Kleint2020-07-232-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually add the comparison operators, which are inherited from QList and not detected by the parser due to: friend QTypeTraits::compare_eq_result<U> operator==(const QList &l, const QList &r) After Change c58c3e5a99a4dee992fd4c7898185181ecc84ae7, the default code will be generated for them. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Icc3d4e759e296303988cd00323876ab5225d8c27 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Implement qmlRegisterSingletonTypeMaximilian Goldstein2020-07-236-0/+295
| | | | | | | | | | | | Task-number: PYSIDE-574 Change-Id: I8828e22da42a5a47b207bb2e02d2f4fe67746a0b Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-07-236-142/+104
|\| | | | | | | Change-Id: I478e94aa42c9f79011edf97f19a7abebb7214421
| * doc: fix Property indentationCristian Maureira-Fredes2020-07-221-24/+24
| | | | | | | | | | | | Fixes: PYSIDE-1353 Change-Id: I65630921f02f2a47c8319349ce649e037a0748b5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Brush up the code related to custom widgets in the QUiLoader moduleFriedemann Kleint2020-07-215-118/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Modernize, use override, nullptr - Fix include conventions - Remove *Private structs. They don't make sense in a static plugin. - Add some explanatory comments - Add missing initializations of members - Most importantly: add error handling to PyCustomWidget::createWidget(), which so far would swallow all errors encountered when executing the Widget's __init__ function. Change-Id: I100a4239013f959c8fb0b0adc0d3a99f73bd4bff Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Fix the QtUiTools testsFriedemann Kleint2020-07-212-11/+17
| | | | | | | | | | | | | | | | | | Import QAction from QtGui. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I5dadb2dd373ff54002563a63acd9e2c38a6c8b13 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Fix some QPixmap-related issuesFriedemann Kleint2020-07-212-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | - static QPixmap *find(QString); has been removed; add a function similar to the overload taking a QPixmapCache::Key. - QPixmap *QLabel::pixmap() has been changed to return QPixmap by value which should no longer require modification. Remove the overloads taking the helper enumeration. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I17a229fef2bc0604c9c7272942a4947e34803957 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-07-201-5/+1
|\| | | | | | | Change-Id: I5c6913b4eea9d6e11415011753e556eca18c5532
| * feature-select: fix crash in scriptable applicationChristian Tismer2020-07-161-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature selection framework had a very early static initialization from the early stages of the development. Normally, Python is initialized before PySide gets loaded. In case of scriptable application, this might not be so. Actually this static initialization was no longer necessary and was removed, as the bug was hopefully as well. Change-Id: I2c703c9cac14b6093d0c43c4bae94ff2b29c0640 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Fix build after qtbase/054b66a65748c9ebfafeca88bf31669a24994237Friedemann Kleint2020-07-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt6Core_DEFINITIONS contains nonsensical values after the change: ${Qt6Core_DEFINITIONS} = -DQT_CORE_LIB;-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> causing ninja: error: build.ninja:6014: bad $-escape (literal $ must be written as $$) Remove it from sources/pyside2/tests/pysidetest/CMakeLists.txt since it appears to work without. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I63e8e6d9215302b916f46808b80ac5ab749c0375 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Re-add QtUiToolsFriedemann Kleint2020-07-202-9/+14
| | | | | | | | | | | | | | | | | | Rewrite the CMakeLists to work with Qt 6. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I2966e4a68ce5703a1f8291ac38afb1aafc155ec7 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | QtGui: Simplify Q*Event member exclusionFriedemann Kleint2020-07-201-66/+1
| | | | | | | | | | | | | | | | | | | | After qtbase/ea2ae140e99bbd21515a99c5480e53129ef843c3, it can be done with a simple pattern. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I9a98e1c513845248204cc0caf70fd6fc53660637 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | QByteArray: Remove signatures of some functions taking const char*Friedemann Kleint2020-07-201-6/+0
| | | | | | | | | | | | | | | | | | | | Adapt to qtbase/631127126cc14e7c01cc611532b3256b58785670. Task-number: QTBUG-84321 Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Id4fa80f77b20b795b5aeae624db5c33110233ca3 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Re-add QtSvgFriedemann Kleint2020-07-208-32/+115
| | | | | | | | | | | | | | | | | | | | | | QtSvg was split into QtSvg and QtSvgWidgets in Qt 6. Adapt the PySide2 modules accordingly. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Task-number: QTBUG-41884 Change-Id: I4ff005dfc6e71ac8eb3e3d45b22a7e507eb88f6d Reviewed-by: Christian Tismer <tismer@stackless.com>
* | QtGui: Update field names of QEvent-derived and related classesFriedemann Kleint2020-07-161-35/+25
| | | | | | | | | | | | | | | | | | | | | | Some of QEvent-derived and related classes' protected fields cause issues with the protected hack. They need to be excluded. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I8a5f38df2463b0c53ded815d6e92f35c5859281f Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Fix build of PySideQTouchEventSequenceFriedemann Kleint2020-07-152-69/+57
| | | | | | | | | | | | | | | | | | | | Adapt to qtbase/4e400369c08db251cd489fec1229398c224d02b4. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Task-number: QTBUG-72173 Change-Id: If0d4247da7039c0edb80c4b93ad10ecef683f2e0 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Introduce unlimited QML typesMaximilian Goldstein2020-07-152-115/+24
| | | | | | | | | | | | | | | | | | Requires qt/qtdeclarative/+/302855 to work. Fixes: PYSIDE-811 Change-Id: Ifdc8e5397ffb7837a8762b23d5996133dce8a4ec Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-07-142-1/+211
|\| | | | | | | Change-Id: Ib984e8fab81ee0cef3c9ab61982ee1a990319d5a
| * Doc: add briefcase deployment docJimmy Girardet2020-07-132-1/+211
| | | | | | | | | | Change-Id: Id0d896330dabee3b5b01aea70f1f15a30797d466 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Fix missing QtCore missing path for the pyside moduleCristian Maureira-Fredes2020-07-141-1/+1
| | | | | | | | | | | | | | | | This enables building QtCore built on macOS Task-number: PYSIDE-1339 Change-Id: I67bd24ea8da1f490cc0c109ff36a01ae9c156822 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix OpenGLFunctions for Qt 6Friedemann Kleint2020-07-143-48/+50
| | | | | | | | | | | | | | Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I5b8e95b232812fa90ec5974b2b578eb581c06ace Reviewed-by: Christian Tismer <tismer@stackless.com>
* | 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>