aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "add wiki link to doc index"Cristian Maureira-Fredes2020-07-062-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-064-23/+27
| | | | | | | | | 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-0631-1777/+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-062-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-0310-10/+140
|\ | | | | | | 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-013-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Make sure we are calling pinned virtualenvSimo Fält2020-07-012-2/+23
| | | | | | | | | | | | | | Installing package to user space is not adding it to path by default. Change-Id: I561f619a9cfc6713ca511c77312dcf19a4ac753f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Increase CI instruction timeout for outputSimo Fält2020-07-012-6/+6
| | | | | | | | | | Change-Id: I2647e497eec68507c6c9bceaeea3e07524301d7b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Initial port of Core,Gui,Widgets,Network,Qml,Quick to Qt 6Friedemann Kleint2020-07-0384-1409/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-036-7/+4
| | | | | | | | | | | | | | Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ice3fbbf2a47833d8bb8702b4b553c87df2d9757d Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Add a dependencies.yaml for Qt 6Friedemann Kleint2020-07-032-3/+7
| | | | | | | | | | | | | | Add an initial dependencies.yaml and remove product_dependencies.yaml. Change-Id: I7e8b5479c667af7508b49b0b39635c22b9d31aaa Reviewed-by: Simo Fält <simo.falt@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-06-3010-28/+56
|\| | | | | | | Change-Id: Ie96254d3b2435f9001c8ab6f12569ce4ffa4c4ed
| * qp5_tool.py: Add an configuration key for the CMake generatorFriedemann Kleint2020-06-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | Add a key Generator (similar to the planned qt6_tool). Currently, only default (make) and Ninja are supported (pending the refactoring of the mkspec option of setup.py, which will become a qmake legacy). Task-number: PYSIDE-904 Change-Id: I75f87c59f8b6421dc5d2b8ae46d3107e2ac61614 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * shiboken2: Do not strip arguments of unknown types of virtual functionsFriedemann Kleint2020-06-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | shiboken2 would strip arguments of unknown types with default values off the function as a convenience. This should not happen for virtual functions since the wrapper will then generate an invalid override functions (happens in Qt 6 for virtual QSGTextureWrapper::removedFromAtlas(QRhiResourceUpdateBatch *) since QRhiResourceUpdateBatch is currently still private). Task-number: PYSIDE-904 Change-Id: I0216e8329820dcda4556e1b685333005db0cf58c Reviewed-by: Christian Tismer <tismer@stackless.com>
| * shiboken2: Accept unqualified names for drop-type-entriesFriedemann Kleint2020-06-303-23/+29
| | | | | | | | | | | | | | | | | | The option expected fully qualified type names (PySide2.QtNetwork.QSslKey), but the PySide2 CMakeLists only create unqualified names (QSslKey). Match this, too. Change-Id: I6c86a4ef9bb1a6bdb6a0672454ac2f2806477408 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>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-06-2710-30/+89
|\| | | | | | | Change-Id: I8c41e854db86e065578c9b1b486c57b5030655f4
| * signature parser: Catch invalid argumentsFriedemann Kleint2020-06-271-10/+14
| | | | | | | | | | | | | | | | Triggers in Qt 6 for: QByteArray toHex(char separator = '\0') const; Change-Id: I2f9d7e39cb085d1e602a70449c3ca24b7480bad8 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-267-4/+50
| |\ | | | | | | | | | Change-Id: I75984f35bcdeeeb3b6004a00670f1582ab522c1b
| | * pthreads: Try to abandon the GIL in case a thread was terminatedFriedemann Kleint2020-06-264-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Update virtualenv to 20.0.25Simo Fält2020-06-263-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Updating virtualenv version to 20.0.25 while previous started to fail. Also increasing the timeout value for output. Change-Id: I391c1c85d490b57cdbab41d5bfcba396384c1994 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-06-2328-83/+481
|\| | | | | | | | | | | Change-Id: I0685101058a4a814d97c56177030bf7a66483643
| * | shiboken2: Add file location to more warningsFriedemann Kleint2020-06-2318-70/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output most warnings in the standard file:line syntax used by compilers. This is done for C++ source code and typesystem files. Introduce a class SourceLocation and add it to type entry, AbstractMetaFunction and AbstractMetaClass. Move more messages into messages.cpp and output the location. Change the errors reported by the XML typesystem parser to the same format. [ChangeLog][shiboken] A number of error and warning messages have been prefixed by file name and line for better tooling. Task-number: PYSIDE-904 Change-Id: Ie2008f4060757e9d7ca1b25c00c7c5585240a7b8 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * | 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-225-2/+16
| | | | | | | | | | | | | | | 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 remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-06-2054-323/+2281
|\| | | | | | | | | | | Change-Id: I59be4217917d79b90169fe494438781b5bdcebf1
| * | Add custom widget shiboken exampleCristian Maureira-Fredes2020-06-1910-0/+949
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This example is based on the WigglyWidget Qt/C++ example, and shows two ways of using a Custom Widget: * A full translation to Python, wigglywidget.py * Exposing the widget via Shiboken. The main.py file includes both scenarios and display them. Task-number: PYSIDE-841 Change-Id: I53c6db540aae2d5672a96bcf8f0e4a3e06b7ce9e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Friedemann Kleint2020-06-192-5/+8
| |\ \
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Friedemann Kleint2020-06-192-5/+8
| | |\| | | | | | | | | | | | | Change-Id: If40b0ab35cd2ad2bd0d982881094ce3dbf46ccf3
| | | * Use Q_OS_WIN instead of _WINDOWS for the path splitterSergio Martins2020-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _WINDOWS is MSVC specific Fixes passing --include-paths when using MinGW Change-Id: I041484eccf521869f4fb532edc55d2e1cf4063e4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | | * 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>
| * | | shiboken2: Remove code indenterFriedemann Kleint2020-06-192-70/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the previous changes fixing the spaces of the snippets, the indenter can be removed. It just requires creating local indentors when writing to separate text streams to avoid unnecessarily indenting by the global indenter. Change-Id: Ic9d9661bb1827d40d6f38dc2d47b5fd84729887c Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | | typesystem_sample.xml: Expand tabsFriedemann Kleint2020-06-191-11/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I64479f27828cfb574427b457223c97176c8646ad Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | | shiboken2: Clean up code injection attributesFriedemann Kleint2020-06-194-104/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the unused enumeration values. Change the class of the "declaration" position from "native" to "shell" since that is where it is used and mention it in the documentation. Task-number: PYSIDE-1282 Change-Id: I547b4bab055df27ce8b0b7b41b9d382dc8f175d1 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | | shiboken2: Refactor wrapper method generationFriedemann Kleint2020-06-192-57/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For virtual functions, the code injection for shell/beginning was not written to the shortcut path added by 50f382579d1323817165d85bf88a394328a4e9a0 (when the method cache is set, indicating there is no python override). Factor out the code into a separate function. As a drive by, actually generate the (hiterto unimplemented) shell/end injection at least for void functions. Task-number: PYSIDE-803 Task-number: PYSIDE-1282 Change-Id: If56f839d414bf7364fdf6af5f3f0d5a76a5fc434 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@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>
| * | shiboken2: Improve formatting of the converter codeFriedemann Kleint2020-06-193-7/+22
| | | | | | | | | | | | | | | | | | | | | Indent the first lines properly. Change-Id: Icd4b86ef875662ef8def52cc3106aad79a0aace6 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | shiboken2: Improve whitespaces formatting in injected codeFriedemann Kleint2020-06-198-33/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Trim newlines and dedent all snippets from XML - Move the trailing newlines into the code snippet function. - Do not indent preprocessor directives Change-Id: Ic8c3745f0b88ee4ed27ac9cbaf376d71a50d9188 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | shiboken2: Generate the num(Named)Args with the correct typeFriedemann Kleint2020-06-161-2/+2
| | | | | | | | | | | | | | | | | | | | | Fixes an integer conversion warning with MSVC2019. Change-Id: I932fc0237712e774f2791d412ed1e52e268d1b69 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * | Update vcredist binaries for MSVC 2019Simo Fält2020-06-151-2/+2
| | | | | | | | | | | | | | | | | | | | | Fixes: PYSIDE-1323 Change-Id: If3a3d885f277044d64e174dd597974ad11a3425a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 80d07788fbf4cdce72041b1d22a66e5f981034a1)
| * | Add missing Win runtime dll into win wheelsSimo Fält2020-06-151-1/+2
| | | | | | | | | | | | | | | | | | | | | Fixes: PYSIDE-1323 Change-Id: I2856c5388b66eb02b18004b894cac8db6c4be10a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 0467ea1c3ddbf81fe4ab9a5c521e1d41ea22481f)
| * | Implement the QEnum/QFlag decorator, V2Christian Tismer2020-06-1519-27/+653
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 20:11:48 +0000