| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I9b923d6fefbfae4efcf63f7459cf1ee89fb08f19
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Added docstrings to the examples sources
to autogenerate the docs for the different parts.
- Updated the conf.py.in to include sphinx.ext.viewcode
to generate html for every source file of the
example.
Change-Id: I668c55070556ca49d12d38c8ec83f09313bffc36
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Replace struct TypeParser::Info by TypeInfo and remove
TypeParser::Info. Move method
TypeParser::Info::instantiationName() to TypeInfo
for this purpose.
Change TypeParser::parse() to return TypeInfo.
Task-number: QTBUG-672
Change-Id: I123d5bf378ad146867b571e47e31ae08a92b2504
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
The qualified name was obtained by splitting by "::", which would
result in
"std::list<std::string>" -> ("std", "list<std", string>").
Fix by splitting up to first '<' or '(' only.
Task-number: PYSIDE-672
Change-Id: I9d790535e877da251a5b6c352dc550e4077877bd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The available constructors for QByteArray are now:
bytes, bytearray, and QByteArray, unicode is not
accepted anymore.
Also the concatenation is now possible between QByteArrays.
Even though is not possible to initialize a QByteArray
with an unicode, we include the possibility to compare it with
one (Compatibility with PyQt).
The __repr__ and __str__ are now properly working.
There seemed to be a confusion regarding data types between
Shiboken, Python2 and Python3 related to bytes,
so now the structure is based on the flag SBK_BYTES_NAME,
which is define as "bytes" for Python3 and "str" for Python2.
Many tests were modified to properly handle string,
using the `py3kcompat` module.
Task-number: PYSIDE-232
Change-Id: I8b671f367c60a0870c72dcbe5662106b3225037d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If `unicode` is used in Python 2,
shiboken cannot properly translate it to `const char *`.
sbkstring did not supported a proper conversion of unicode
types in Python2, and this change includes it.
Task-number: PYSIDE-100
Change-Id: I3a70d935ad61b0e567e620c62754800370270a6b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
| |
Change-Id: I15f0f823b4fe45f544c0800e1bd3f205ccf7efaf
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
| |
Change-Id: I3188c33414d283478a6ff6d7d354ce9231b4f106
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
| |
Change-Id: Ifafae9a5eac1844bf9057bc5e1f912e287499aa7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
| |
The function didn't check the value of
pre_release_version_type when printing the version.
Change-Id: I29db3f40e6fa8c397432433aa285b30f15b8e3ca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This changes coin_build_instructions.py to read the version in
sources/pyside2/pyside_version.py to check if it is not a pre-release
version (no alphas, betas), which means that --snapshot-build
should not be passed, thus generating proper wheel names that can
be uploaded to PyPI.
This eliminates the need to remove the --snapshot-build param
on a per release branch basis (and thus, less things to remember
for official releases).
Change-Id: I10afcb5bfe8a661583104f3d7b2c0b4ebd4530fb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
This is needed to generate correct wheel names, that can be uploaded
to PyPI.
Change-Id: If97496d201af13f58f9dae8b61ac86bef68d8717
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It was weird seeing "-DFORCE_LIMITED_API=yes" being passed from
setup.py to CMake when "--limited-api" is not included on the
command line, and then seeing "-DFORCE_LIMITED_API=yes" with Python 2
builds. It gives the impression that maybe it could work with
Python 2.
Instead, don't pass "FORCE_LIMITED_API=yes" from setup.py by default
(but still pass it if it's present on the command line), and instead
default to "yes" within the CMake project themselves.
In the end nothing changes, limited API builds will still be default,
but at least it's not as confusing to see the
"-DFORCE_LIMITED_API=yes" lines for Python 2 builds in the CI log.
Change-Id: I08c863394dd148d88bec324a6cab35459d75303a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
PyPI only accepts binary Linux packages that are built conforming to
PEP 513 / manylinux1 support. The gist of it is that extensions need
to be built on CentOS 5, so that they work on most newer distro
versions than that.
Official Qt can't be built on such an old distro. The minimum
requirement is thus CentOS / RHEL 7 (which we used for packaging
Qt 5.11.0 on Coin).
We do want to upload packages to PyPI, so we have to resort to
including "manylinux1" in the name. Currently this is tied to
the limited API option.
TODO: In the future we should name packages "manylinux1" only
when the distro version is acceptable for Qt build requirements
(RHEL 7.x). It might get a bit messy though, due to
platform.linux_distribution being deprecated, and the necessity
to depend on the new "distro" package.
Change-Id: Ic4dfccd87d810360cbbfce72b27d5fa31e2a59dd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
| |
Change the style of the code to follow PEP8
Change-Id: I93eb0df893e8305b4e65ab5318383433b0655625
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Wheel has poor support for naming wheel packages that were built
with limited API enabled. We need to override some of bdist_wheel's
methods to generate a correct name and correct metadata.
Move the pyside_bdist_wheel class into a separate file, and implement
the necessary logic.
Change-Id: I23d814cbb794052fb18a1e018f7b767c60945254
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
This includes .abi3.so on Linux and macOS, and .pyd
on Windows. Otherwise if you build with Python 3.6, and
try to install the package on Python 3.5, none of the
modules would be found on import.
Change-Id: I56639da6319cfa06e23ae793d66099813074adf4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This is the condensed checkin of 18 commits which created
the implementation of PEP 384.
Task-number: PYSIDE-560
Change-Id: I834c659af4c2b55b268f8e8dc4cfa53f02502409
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Remove bool *ok-parameter from AbstractMetaBuilderPrivate::translateType()
It was only used to handle the special case of void return values of
functions where translateType() returned nullptr/ok = true.
Add a check TypeInfo::isVoid for this purpose and move this handling
to traverseFunction instead. For all other cases, translateType()
returning nullptr means failure.
- Remove the code triggered by the bool resolveScope parameter
of AbstractMetaBuilderPrivate::translateType(). It has been
observed to not find any matches, likely due to the types
being fully qualified by Clang.
- Remove function AbstractMetaBuilderPrivate::decideUsagePattern()
which was a one-liner calling AbstractMetaType::decideUsagePattern()
Task-number: PYSIDE-672
Change-Id: I0336896917cb914d4d622eefa0a21e6e319efa0f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The tool was originally written to handle a license embedded
in a Python file. This has changed, the license now exists as
a text file.
Rewrite the tool to concatenate the output piece-wise instead
of using fixed formats to be able to cope with missing URLs and
versions. Add the copyrights, which were previously missing.
Task-number: PSYIDE-363
Change-Id: I5ec0bd7a4b81e9f794f56f6b2b09062c331936ae
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
| |
Change-Id: I200b87bc4e66d17d8eefe42359ab6bcc36d24f6c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Disabling some of the configurations due to fact that those are
not supported yet. 32 bit windows build on 64 bit host will be
re-enabled once we get 32 bit python provisioned to 64 bit windows.
Change-Id: I74492ed654dfef5aaf8e02ca8e0c715a0c27d2c8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
| |
Task-number: PYSIDE-363
Change-Id: Ib0bc82733932eb96f9d2ca42649d28bc600d8f60
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Work around the non-standard header naming of the module
in the documentation generation (see also file
sources/pyside2/PySide2/QtX11Extras/QtX11Extras_global.post.h.in).
Task-number: PYSIDE-363
Change-Id: I3ff8bb666513a13fde4d13693fd06bdd7866e050
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
| |
They share the qdoc.conf file with QtMultimedia, which
needs to be special-cased, similar to QQuickWidgets.
Task-number: PYSIDE-363
Change-Id: I5abade0a715ff3245be2322eae42e7c93f643fc9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
| |
Complements 9d10897929350417f4c7b2dcf06966ff7c67c5a6.
Task-number: PYSIDE-487
Change-Id: I4a01c986535c0d7ba8362760c1b8e89a2f8e9936
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
| |
- _templates/index.html
Change-Id: Idcde052a1a77e2ade1de712db79da95d5ed6c02c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Amends 6f894c2667c77e2580e7312d2ebed05efa7d654e.
Reduces Qt 5.11.0 Linux wheel size from ~219MB to ~139MB
(~80MB delta).
Task-number: PYSIDE-661
Change-Id: Iaae1089183148037d94fe541f26426fd51c0f54d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
The functions has been renamed due to PEP8 formatting.
Amends 71249b93a5d12a320b44c608c05fb9d220788a18
Change-Id: I00206e1dda77f672d6883406e47debda19bc622f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
| |
Change-Id: I63e3d87a62932e20ce28bf344636c05a61f1c6b0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
| |
Task-number: PYSIDE-487
Change-Id: Ib8eb4a77f04ddbbe2c4b164b95f49e2f53bf44d9
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: I8dc16c10565da8f93ba5cb7cace004f8eaf52236
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is the standard name of the license. See also
https://spdx.org/licenses/Python-2.0.html
Note that there's some deviation in the actual license text: The
text refers to the exact Python version. Also, the SPDX standardized
license contains additional text for some modules.
Still, it's better to use the standardized name than inventing
our own one.
Change-Id: I64b20bc558928ca28edaf81925a049fcaeb124b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The XQuery used to obtain the function description can fail due to
argument type mismatches (typedefs or blank formatting).
In that case, repeat the query restricting the search
the argument count. If exactly one match is found, use that
with a warning. Output the matches otherwise.
Split out functions for the function queries and and helper
function for creating the XQuery with flags.
Task-number: PYSIDE-363
Change-Id: I83aaa53511896ee78a25f39a769ca907d0ac10bb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
| |
Output line and column.
Change-Id: Ide890b93c47ef0fc9ebe3209356da100e0cbde4e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
| |
Introduce an attribute for added methods and exclude them
from the documentation generation.
Task-number: PYSIDE-363
Change-Id: I06d3f468bcec4d0480012d29e26dabadae51634b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
| |
QVariant::Type is a primitive type, yet the fully qualified
name should be used. Remove check for primitive types and
always use the qualified name for building the doc XQuery.
Change-Id: I8d12cf7d3095ce9e7baa2b6436cc90385bdedc22
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Sometimes users might have stale cmake files installed into the same
location due to building multiple Qt versions (e.g. 5.9.3 and 5.9.5),
and find_package might bail out trying to use the older version.
Make sure to print which cmake dir is used for each module, if
the dir is available.
Change-Id: I376ef95c682196c7f79d3c0e604d8225d1d2ff30
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
To be able to create 32 bit wheel in 64 bit Windows, we must use
correct Python version.
Task-number: PYSIDE-646
Change-Id: I72c05e9c5b6f37f16c118e36c3c7ea8f90ee7dff
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
| |
If a -qmlmodule.webxml file exists, insert a link to the
Qt online documentation.
Task-number: PYSIDE-363
Change-Id: I49a46ed097e8f7136b39f38e2206a2229dd08e41
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
| |
These are legacy files replaced by the respective versions without 'v'.
Change-Id: I3f53548058704688874589a31be6adaf33935c60
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
Add a warning explaining that a rejected abstract function
will cause compilation errors later on.
Change-Id: Ibcad7d79df719b0ffbaf59a0ef9eec6f22aea2ed
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
| |
Adapt the layout template accordingly.
Task-number: PYSIDE-363
Change-Id: Iea3b50770acf908f04fcfbd39d178de33c247c01
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add QCameraFeedbackControl, QMediaService, QMediaServiceCameraInfoInterface,
QMediaServiceDefaultDeviceInterface, QMediaServiceFeaturesInterface,
QMediaServiceProviderHint, QMediaServiceSupportedDevicesInterface,
QMediaServiceSupportedFormatsInterface, QMediaTimeInterval,
QMediaVideoProbeControl, QMetaDataReaderControl and
QMetaDataWriterControl.
Add commented out classes QCameraFlashControl and
QCameraFocusControl with explanatory comment.
Task-number: PYSIDE-487
Change-Id: I4125ee2088bde487c36c3c13dd7b05d6667b0711
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When building PySide2 with the ninja generator, ninja prints an error:
"ninja: error: build.ninja:18549: multiple rules generate
./sources/pyside2/pyside_version.py [-w dupbuild=err]"
This seems like an interaction error between CMake and ninja, where
file dependency paths are not canonicalized. In our case
this happens due to usage of pyside_version.py's relative path.
Fix is to use an absolute path.
Task-number: PYSIDE-663
Change-Id: Iee2ae5ea483e59ee67e53e3a2059108bf8a34fbe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
Introduce a simple [] notation for target directories.
Task-number: PYSIDE-363
Change-Id: I3a0cd255faf84f564a64992cba88244ae14c2452
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
First encountered in:
QtScxmlEvent::setEventType(const EventType &);
The metatype was wrongly detected as NativePointerPattern
in AbstractMetaType::determineUsagePattern().
Introduce a helper for detecting plain const-ref and use
that consistently.
Change-Id: I6b105bc99ae63e4737c5d628e79f23b7acbcca3d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A CMake project is included that builds two shared libraries:
1) libuniverse - a hypothetical C++ library for which bindings
need to be created.
2) Universe - a Python module containing bindings to the above
library.
The example showcases the following concepts:
* primitive type bindings (bool, std::string)
* types with object and value semantics
(pass by pointer VS pass by copy)
* inheritance and overriding virtual methods
* ownership of heap-allocated C++ objects
* constructors with default parameters
* general structure of CMakeLists.txt file for generating bindings
Task-number: PYSIDE-597
Change-Id: I7b0f203e2844e815aa611af3de2b50a9aa9b5bfc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
When the --openssl option is given, it should point to the openssl bin
directory, and not to the openssl.exe file itself.
Clarify this in the setup.py comments, and fix it in
coin_build_instructions.py.
Task-number: PYSIDE-660
Change-Id: I5b20a8c5a445c9f628c5abc258c43271c490e08c
Reviewed-by: Simo Fält <simo.falt@qt.io>
|
|
|
|
|
|
|
|
|
| |
Join the remaining entries.
Amends e8291778cd1bab2679033cecf3f756bb2d2935ab.
Change-Id: I5bb0b129fc92158a16470fcab1826f7a6ea02203
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
|