| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Remove obsolete types.
Change-Id: I6397f354fd02d47810668b93a65a661865697531
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit aaf3a48f544a40b75de2272f33fab512d85f6469)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Remove obsolete warnings and add new ones.
Change-Id: If4b8d1cfcfe858e86079eac32f24c3c65cbcf583
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit dbbbeb3c938be1f3f2a3888845113db1660873a7)
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
The argument type is not necessarily a PrimitiveTypeEntry.
Task-number: PYSIDE-1660
Change-Id: I312f20e24cfe888d10c218db596d29c3ab318bd6
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit f6e8ba7e9861e29dbd995d984accc79e96a10388)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Fix the rightAligned property setter to have the same name as
the getter
- Fix the anchor property of the delegate
Fixes warnings
examples/quick/painteditem/main.qml:102:TypeError: 'NoneType' object is not callable
examples/quick/painteditem/main.qml:65: TypeError: Cannot read property 'right' of null
Fixes: PYSIDE-1662
Change-Id: Iebd7a9632954fcc2b48e8a56f6e1c20d62b34468
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 0055c90694cbf8a82a4c3ee75d47b6d2538f6247)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Do not store a reference to the (cached) function
modifications in CppGenerator::writeVirtualMethodNative()
as nested method calls may invalidate it.
Change-Id: Iac6b0f27649935c875603c6fff10a80d98824714
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 393543d02ac5b8908ff80f75e0460bbb4fb901aa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Fixes: PYSIDE-1659
Change-Id: I9025e8454d7153faec8b49f0ae02bf175dae3fd8
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 650d22e26ce4543aa62169c99a0753de7f6891ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The test used deprecated/removed functions of QTime,
causing:
AttributeError: 'PySide6.QtCore.QTime' object has no attribute 'start'
Use QThread instead.
Change-Id: Ib6c7d043d3386eae3c1145b5966c86bc8c31562f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit d3877ec7445bc7719aff233bae16243b563d5a04)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix the macro name, amending 4d63dfffb661115f58cca60c80c4649ba982e01b.
This was actually discovered by PyPy bug hunting.
Change-Id: Ic71ecf07dc3e03d23fa505d8a3fad3f7b933c354
Task-number: PYSIDE-1655
Task-number: PYSIDE-1033
Task-number: PYSIDE-535
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit df81513945fd40c3ce6b28605ba656f35c814602)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Fix the macro name, amending 4d63dfffb661115f58cca60c80c4649ba982e01b.
Task-number: PYSIDE-1655
Task-number: PYSIDE-1033
Change-Id: I2d86806dda51091cecebfa4b90ce7d5582b7b197
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit cc7da649aff335ad86c669e3ccb0185738e9d9ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
The doc build fails otherwise.
Task-number: PYSIDE-1623
Pick-to: 6.1.3
Change-Id: Id7578eb58f71567dc9d7c9d0ffcfb426f59b7980
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
| |
The new version will be added in 6.2, and some changes
were pushed to 6.1 but they were not working.
Change-Id: I0ce85b1ebcfcba6bd0d683fa543bc8fdd7e4d080
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
| |
Change-Id: I9e27c1c37d2d0760e6d90b994e9c4a55d0b4420d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 35b6bb0a13d6ba3a7dc826c26b331164a86cb8d3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ia90db907eb68d362a6b722358312765325539443
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
| |
The check code itself crashed when qApp_last == nullptr.
Fixes: PYSIDE-1647
Change-Id: Id8839bf551ad63f6ef2a1a997dabf455d3588c11
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 2c41d10a6a1f6fb7b496fc8c4c59e377b819f634)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After the new primitive types appeased in macOS, there are
many new missing signatures. Many missing array modifications
could be solved im mapping.py .
The rest is only possible with a heavy change to the QtGui
and QtOpenGL XML files. It will be fixed in 6.2 when we have
the possibility to unify types by an XML PI.
Task-number: PYSIDE-1646
Change-Id: I6e4c1b4e2409f830523d308b2e6dfafa3870132b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 87e07fad6063736b46f19573e0af5f0fdf85cba9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Rejection works before resolving typedefs.
Task-number: PYSIDE-1646
Change-Id: Ice7ed94e4e0aa21783171bb3fe99ed49907f7ccf
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 5557b5df397265a29e406926cf6dd1a4bda561b7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: Iccbaf49d0974340cc55b69fafec4a9daff05e778
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 33da1f55b92e9bcf3d7fa656f979cc5e1817bcb6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Add QOpenGLVersionFunctionsFactory to list of dropped entries.
Fixes: PYSIDE-1636
Change-Id: Ie203372c2d15776a466f0fa04fe32a777bf85e52
Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit e0848b2d644574e914d3f71c1fe4b309e39ac099)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
macOS has
typedef uint32_t GLuint;
typedef int32_t GLint;
Add those types (C++11/C).
Fixes: PYSIDE-1646
Change-Id: I7cd857ed06fee9925250964bdcdd93c42a251e34
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 901c2bdc12f4d5ce25c9b05a23915447fcc037d7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Ammends afa216bb3145009b819db643a44f47b20d5ccd2d
since it didn't consider the shiboken landing page.
Change-Id: Iec2ca36108c9ad281b8b450818fdaf7d60153366
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit e034d7f685212e6db15e0583aac8d054c543bc90)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are a number of cheating macros that allow to use
the same code in Python 2 and 3. Because Python 2 is gone,
remove these macros.
This conversion was partially difficult since certain types
collapsed in the XML files and generated functions contained
substrings of the macros. This is actually the fourth attempt.
Task-number: PYSIDE-1019
Change-Id: I116877afc8aa36f4710a40df1769f600b6b750ea
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit a21203d534c2947a2e5f472ace3e83c552e83191)
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
++ the 6.1 version caused problems due to missing pieces
++ the classmethod patch was missing, too
This function caused problems when extending the signature module:
For class methods, the signature module must become able to
distinguish class methods in properties (true_property) which are
static methods without a feature.
That means: The signature module must know the full info
about feature switching. Moving getFeatureSelectId into
Shiboken simplifies matters quite a lot.
The main feature switching code remains in PySide.
Task-number: PYSIDE-1019
Change-Id: I99116eefc0faf24a6eb9a16d79b21a5cc7ae299e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 521dc4b6dcdd7d04a9ef6afe273833016f7ba31c)
|
|
|
|
|
|
|
|
|
|
| |
This is mainly to avoid the logo with a large
white space next to it as header.
Change-Id: I135b5f91b687b198750ae666b90696ea9e0a2424
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
(cherry picked from commit afa216bb3145009b819db643a44f47b20d5ccd2d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
++ This change was forgotten to port to 6.1 . It is needed for
++ feature: move getFeatureSelectId to Shiboken and refactor
[ChangeLog][PySide6] The tr() translation method of QObject
has been changed to be a class method. This makes it
possible to use tr() on a class without instantiation.
The tr() method of QObject should be a class method.
- Build class method support into apiextraktor.
- Use the new functionality in the tr() method.
Listing of tr() in QtCore.pyi will be solved in an extra check-in.
Task-number: PYSIDE-131
Task-number: PYSIDE-1252
Change-Id: If5093e038c091bf8c4d2a940fe206f6caa99568e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This allows threads in the methods:
- waitForBytesWritten(int)
- waitForReadyRead(int)
Fixes: PYSIDE-1640
Change-Id: I391feb7b5c834574c12e378318d5a39c49a4a75e
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit c7c0d1527085b4038ee39c66910285a83a110735)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Fixes: PYSIDE-1639
Change-Id: I14ed08de3ba883650c32b4c2242c54c57624e087
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 9a54b25b35539e0710e0dd00c95267ae7d5c8954)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use QCoreApplication.process_events() instead of
qApp..process_events() which causes:
AttributeError: 'PySide6.QtWidgets.QApplication' object has no attribute 'process_events'
Amends 9b5fa60d1fed5025e97c393ba1bab80f81ba833a.
Task-number: PYSIDE-1626
Change-Id: I7a268c8fa5b699813dfcb37a3093bd897fec381c
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit d57e16a89fb963c7416f6a9875773ac0edbcb032)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The BindingManager::getOverride function computes the current
switch state from information of a type object. But the type object
must first be updated in case a switch has happened.
The solution was an extra update call at the beginning of the
function.
This solution _always_ works, with or without inheritance, for
Python >= 3.7.
[ChangeLog][shiboken6] Coexistence of different feature
selections works now, especially for UIC files and inheritance.
Fixes: PYSIDE-1626
Change-Id: I577331cfb2d7511110d1e16e729bed80985340a0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 9b5fa60d1fed5025e97c393ba1bab80f81ba833a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
f-string usage was wrong in command.py with triple-quotes.
The effect was quite visible when inspection build logs.
Also note: f-string expressions cannot contain back-slashes.
Amends 8c1b6d88c19633a7373c052a2af3f584ad2114f7.
Change-Id: I9f02c19d6993fa5b47bb07f361297fbe8c105749
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit ecc588bfbc15c1c344093601374e16c4e64dc075)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
There were 2 versions of the helper, one returning QString and the
other QByteArray. Use the QByteArray version to save conversions.
Change-Id: Ibd0038f016c13535018dd4624db29cc4c0ddc824
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 0949e3f35590783867a87e4e340ce4c44c79546f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: Iafa3a7f4e0a81733c5a99a907e808391270ce8c6
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit b9864c4f27b93d6c6948c0fc750af6fb976fe8dc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Acquire the GIL in the callback to ensure Python is ready.
Amends 0864de0b26888a795808faa234d9717066e821b5.
Fixes: PYSIDE-1629
Task-number: PYSIDE-574
Change-Id: Ie6524b39c12f1f27c427e8423dfd2190a48c1353
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 8535659567b500a3055cd1ddfe9c16f8122a8738)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
This can lead to crashes later on.
Change-Id: I37dfa82885dfbf81de101e58bea774258ccfa86f
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 5929e397bbe41c45ba416ce87dfa5b431ea224c9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
The removal of the range was not necessary and created a warning.
Task-number: PYSIDE-535
Change-Id: I07e87e544c13e58e6369b81bbecce43da37b0a86
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit dcfbb326e431de1e710385a8126b4a2739e2e921)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QItemSelection with no argument should create an empty
selector. This worked in Qt5.
In Qt6, everything works but the empty argument.
Without further analysis, this might be related to the
new [default] tag found in the Qt6 QItemSelection documentation?
Fixing this bug leads directly to the add operator, which returns
a list instead of a combined QItemSelection.
Fixed by removing `operator+(list<QItemSelectionRange>)` and re-adding it
with QItemSelection
Unrelated, occurred during bug hunting.
Task-number: PYSIDE-535
Change-Id: Ie5b881659e54fc0eebc8c9903df6e14eb2788565
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 16429c860888578b5bda7fd75437dd1f6a79b331)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Factor out a function for checking the bindings generation
and use that in getInheritedOverloads() as well.
Amends b1b2cc2ebed2fcf6e31c1fbbdd3638216e34717b, which caused
some modified-removed functions to be generated in derived
classes.
Change-Id: Iddb2f868c360da5397279cc3058cb554f5e51b42
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 795e5b7c7521d275750590be728ed1078150f537)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
With the new implementation of an importer for virtual
zipfiles, there is no longer a problem with traces of files
in the file system.
Especially, cx_freeze should have no longer any signature
related problem.
This version cannot be backported to Python 2.7, but it will
work for Python 3 and PySide 5.15 .
[ChangeLog][shiboken6] Embedding of supporting Python files
is now completely virtual. No FS files are involved any longer.
Change-Id: Ifa0942b4476bff95e823505897b867735418ca69
Fixes: PYSIDE-1621
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit f7db16f3e9e7a567a3f8993507b701b20addb627)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Add all occurrences found by name in getInheritedOverloads().
This manifested in missing overloads of QWidget::addAction()
introduced by qtbase/08e4d2db084f6abbf1840ffb694b15bd215ad069.
Change-Id: I6b3bf143d32addbbb6b8332bed5e86e1677b0e28
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit b1b2cc2ebed2fcf6e31c1fbbdd3638216e34717b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The signature scripts needed an update to make them
work even when no source files are available.
* Access to the license text should avoid source files
* Some loader simplifications are possible since Python 2 is gone
* The import list for PySide is incomplete
* Enforce embedding in COIN mode for better testing
This is a preparational step before the zip file access
becomes totally virtual.
Change-Id: I85e750bb718855f140edac6de34955adbd7843bc
Task-number: PYSIDE-1621
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit a9de26109fca55154511f5d074c7d9e135b397f6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Checks for the number of arguments were not generated in some cases.
Change-Id: If414cdd2eb4190966e847232128600d61a4769f6
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 947a7f5f5d55b6f72b449578d905e9a4b5feb6ea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: I45656ce217ac87f00241abe6422f4d440c4ee6f0
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 36aa3df2adf799240070570f29946d39104f9aea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Addressing the long lines, and inconsistencies with double
and single quotes.
Change-Id: I2d18116f0dd9215fa3cfe15482e606fc064f42da
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 2654740274986e897427caf667fed93601e01bbd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Fixes: PYSIDE-1623
Change-Id: I667681f5a419921ddd25e04528b3880b7001214f
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 125d3edcee32ae3f7c92d2a9a10b6ecee769de74)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The return type conversion was broken.
Amends 62acb997f7fce1ae922e3a9995272c78353048b9.
Fixes: PYSIDE-1625
Change-Id: Ib83c363bee4a3c3de4008fdbf6e175093ef3a872
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 401a5b8a3d4468f97ec20a86055ad785262ceb43)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
[ChangeLog][PySide6] The `tr` function now works also for
PySide derived Python class instances with the right context.
Qt has a translation feature that works fine on strings that
are directly parsed from a Python class.
For derived classes, the correct context could not be found.
This problem could have been solved by obtaining the calling
function name from the frame stack, walking the mro and
examining in which class dict the calling function can be
found, but this works for Python functions, only.
For any function, simply probing the translation result is
even easier and always works.
We walk the mro, too, but simply use each class name in turn
as context and probe by comparison if a translation was done.
Change-Id: Ibca9dc0098a3aa26a674b3d5e24ea14e651fe6de
Fixes: PYSIDE-131
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit c61141d43fd6e56a52449cbfe6cc13d07f9156bb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: I7c56bf26d7b501e4c7a906fe87d48002c316d25b
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit a894ba132cbc9ca8368ff8cad89e3e984144637a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This includes a case where the passed type is not
a Python type, so we fallback to a QVariant type
as Qt/C++ does.
A 'TypeError' is raised if the Python type used
is not considered.
Added a couple of tests too.
Fixes: PYSIDE-1619
Change-Id: I5f2e277bb6ccbf9c3a1b23e79717c11ff7635ce5
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 07b93a82afc22760f87a68fa9926dd316c4a0815)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: I58d0ff45607b585beb008499728998d46e4679bb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 8ae7438a8e14d937a68199d8944fc684081be4c6)
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
| |
The function does not return an error. Since class FileOut
also creates the directory and throws on failure, it is not needed.
Change-Id: I5ad78e9789cb194df262342fb3aed6bd00dfb455
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 0a935931b529ea2aafcb0415c13a4b8cd0ef6487)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Change-Id: I55a614b5cabe9b3dcc45de17e7a22c47ae0e643d
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 8c1b6d88c19633a7373c052a2af3f584ad2114f7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|