| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
| |
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: I4e31b27e9614479e0d9b0eeb858dc9701dc5b8d6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Fix a number of miscellaneous flake8 and typing issues exposed after
updating to the modern typing syntax from 3.10 onwards.
Task-number: PYSIDE-2786
Change-Id: I5476d1208dd1da3fa93bdec02bc6124a80b247fc
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Split coin instructions into separate files specifically for
Desktop, Android and common instructions
- Make changes to cross_compilation script to support coin.
- new 'coin' cli argument introduced. This is required because
Qt installation from CI servers differ from the Qt installation
from the maintenance tool.
- Add a shell script to override the Python used for cross-compilation
for the macOS 13 x86_64 system.
This system is responsible for building the arm64 Android wheels.
The system by default uses Python 3.10. However, python-for-android
requires Python 3.11. Hence, we manually install python 3.11 into
a non default path and use it for cross-compilation.
The default Python of the aforementioned system has been updated to
3.11, but system still uses qt5#6.7. Hence it is not reflected yet.
When ac72bb1d489f7442fe8d9aa168298a94ff62d941 is merged, we will
finally get 3.11 and the need for this script can be removed.
- Add markupsafe==2.0.1 to the requirements.txt file. This is required
to prevent an error while installing Jinja2.
ToDo: Tag Jinja2 version so that this requirements can possibly be
removed.
- Currently only x86_64 and arm64 wheels are produced since they are
the most important. Most Android devices these days are arm64. This
can be expanded to also include x86, but armv7 requires a Windows
host and that is currently not possible with the CI. For armv7 wheels,
users will have to build the wheels themselves using the provided
cross compilation Python script.
Task-number: PYSIDE-1612
Task-number: PYSIDE-2766
Change-Id: I8f15a85887e207a5c6605fd8696d15b4646fb2fd
Reviewed-by: Simo Fält <simo.falt@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
We can already use the modern typing syntax introduced with Python 3.10
in 3.9 via future statement definitions, even before we raise the
minimum Python version to 3.10.
Note that direct expressions with "|" don't work yet.
Task-number: PYSIDE-2786
Change-Id: Ie36c140fc960328322502ea29cf6868805a7c558
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
| |
|
|
|
|
|
|
| |
Add a future statement to all Python source files.
Task-number: PYSIDE-2786
Change-Id: Icd6688c7795a9e16fdcaa829686d57792df27690
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
- Additionally, also move setting Python_SOABI manually for Android to
where FindPython CMake module is called. This also aids in naming the
wheel correctly.
Pick-to: 6.7
Task-number: PYSIDE-2766
Change-Id: I73c089d31e2ee629f3ed676965fca27d53882110
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- For macOS, the Ndk is downloaded as .dmg image. This code downloads
the .dmg image and mounts it to extract the NDK.
- The SDK is downloaded as a .zip file. It is then extracted.
- For the build-tools, version sometimes previously the latest version
was downloaded which also included RC versions. The current code
changes makes sure that RC versions are not downloaded.
Pick-to: 6.7
Task-number: PYSIDE-2766
Change-Id: I1be39b1dff55bb1f2f4c3f4882908b429d37f4cd
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- first of many patches to support macOS host for Qfp Android
cross-compilation.
- Use config.guess present in cpython repository to guess canonical
name of the host system. This sets up build for hosts other than
linux.
- As a drive by, update the default api level to 26 to sync with Qt
minimum version 6.7.0.
Pick-to: 6.7
Task-number: PYSIDE-2766
Change-Id: Ifcf0921776e6a682d5724f439739ed098ccc6ef3
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
- Remove the use of patchelf to set the SONAME of the libpython shared
library.
This can be done during the build process of CPython for Android
by setting the INSTSONAME variable in the Makefile.
- In addition, remove the redundant parameters passed to make install.
Pick-to: 6.7
Task-number: PYSIDE-1612
Change-Id: Ia18a1480a676abb89ed1afa3250f3745fffedbdd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
The interface was added as preliminary in qtbase commit
9d16d5e2245c26e5746fd7609300b84a2a983457 and is no longer
preliminary since qtbase commit
2496882ea71b8bc52c84e1b9c59cfd48cd56c6f2.
Pick-to: 6.7
Change-Id: I8a24aa2a7a1cd961bdc9974f41d407783ad1a82b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Add a script which scans C++ headers and typesystem files
and prints missing classes.
Task-number: PYSIDE-2620
Change-Id: Ibd2d1aab8debc19e72d9847af180fd425c17db9d
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
| |
|
|
|
|
|
|
|
| |
List widget/graphs/quickcontrols gallery examples first.
Pick-to: 6.6
Task-number: PYSIDE-2207
Change-Id: I94aad562a4085c2695bb3d0f592bb7034e6eae26
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
Sort by name instead of target documentation file,
which may contain additional subdirectory components.
Pick-to: 6.6
Task-number: PYSIDE-2207
Change-Id: Ic5eacb4cf92614f5a4fd1c9cf489ccf8100a8ce4
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
Add a description data structure for modules specifying type
(essentials/addons) and a sort key. Bring QML/Quick/Widgets to the
front.
Fixes: PYSIDE-2207
Change-Id: I491f28bf72b5be30c94d51323a423cf9f2ddd73c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
|
| |
- deployment is anyway tied to Python 3.11. No point in having the
--limited-api option.
Task-number: PYSIDE-1612
Change-Id: Ia12fe60fe3bbb828664bb8c8ba16b3adf0130252
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
|
| |
- Amends 07d3c8dc71f8c5102cb37e95aa1f2caa35cff115
- As a drive-by, also remove --unity option which is now default
Task-number: PYSIDE-1612
Change-Id: Ie26afd7351edb94e63f096740bd1d20e1d705005
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
- python-for-android target python is now upgrade to 3.11 -
https://github.com/kivy/python-for-android/pull/2850. This constrains
us to update to 3.11 to resolve linker issues for shiboken and PySide
binaries.
- The also helps for CI wheel creation since the Python version in our
CI system is 3.11.
- As a drive-by remove designer plugins from Android wheels.
Task-number: PYSIDE-1612
Change-Id: I8c75d4d4567b6830e26a2d9a24db90592f6dc03d
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
- 3.18 to 3.23
- This is strict requirement since the binaries are linked to Python
3.11 and Python 3.11 is only supported from CMake 3.23 onwards
- https://github.com/Kitware/CMake/blob/v3.23.0/Modules/FindPython/Support.cmake
Fixes: PYSIDE-2553
Task-number: PYSIDE-1612
Change-Id: I8b7d4b825f03eb40f0a9059d6a4b31329f6ea06f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
|
| |
- Amend according with d1760bc8100c94a831f80080a5433a360266c5e2
- Update Android NDK to r26b aligning with Qt
Task-number: PYSIDE-1612
Change-Id: I4ddb99568617d73213f83536f2c2a2e028d927ee
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
|
| |
build_rst_docs can sometimes result in the directory being
present and deletion can fail (particularly on Windows).
Pick-to: 6.6
Change-Id: Ib0a4f7db9e5010b6150cbfef8a30f443ce0165ee
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
|
| |
|
|
|
|
| |
Pick-to: 6.6 6.5
Change-Id: I06c2c294decfc7936f9a65bbdcc02bfee481f578
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Supports creating wheels for all 4 Android platforms in one single
run.
- The earlier --plat-name option is now optional and takes multiple
platform names. If the option is not specified, then wheels are
built for all the Android platforms.
Pick-to: 6.6
Fixes: PYSIDE-2550
Task-number: PYSIDE-1612
Change-Id: I003e34046a88e792dde89a4d224918b5608111aa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- There were a couple of errors when building Android wheels for this
platform mostly caused due to having an extra "eabi" for all the
clang compilers, but also that the CMAKE_HOST_PROCESSOR name was
wrongly specified.
- The api_level passed while creating the cross_compile.sh script was
also wrong as this should always be a number.
- The CMake FindPython module returns Python_SOABI as empty for armv7a
due to a possible bug in the FindPython module. The Python_SOABI is
obtained by running `python3-config --extension-suffix`.
python3-config be a script can also be run on the host platform and
hence for armv7a, the Python_SOABI can be explicitly specified to
workaround the CMake bug.
Pick-to: 6.6
Task-number: PYSIDE-1612
Change-Id: I3515db730b8c4f283f4c9f1d2e78fbc9d1aa903a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Instead of creating a temporary directory and adding toolchain files,
cross-compiled Python etc., these are now stored in
.pyside6-deploy-cache and are cached.
- -apic option removed. Since cross-compiled Python is now by default
added to .pyside6-deploy-cache, this option can be removed.
- Run `distclean` on the cloned CPython each time Python is
cross-compiled. This lays the foundation for multi-architecture
support.
- Add a cli option --clean-cache to clean .pyside6-deploy-cache. More
control is given with this option to clean only specific folders or
files.
- Remove unsued variable qt_plat_name.
Pick-to: 6.6
Task-number: PYSIDE-1612
Change-Id: Iaa0e35e49e0bf9650b97c87d2b8db3c6c86e0d5c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
- removed --ignore-git and --skip-docs
- Fix some flake8 warnings
Pick-to: 6.6
Task-number: PYSIDE-1612
Change-Id: I76994ddf2f5c26f86ac8d6c2e422ac3764b09c01
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
| |
Pick-to: 6.6
Change-Id: Id6e9cdbc7c0b763e8bbb4b7e8dc3ab568b65ebf8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
| |
- default is now r25c
Pick-to: 6.6
Change-Id: Iff109351a52452a68f6e841be25b2ca35e2ce29d
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
|
| |
|
|
|
|
|
| |
Task-number: PYSIDE-1106
Pick-to: 6.6
Change-Id: I449299a92c91431fe6b742021cee33ae745d0589
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
version logs, take 2
Set the command line option from the release type auto-detection.
Pick-to: 6.6 6.5 6.2 5.15
Change-Id: If911949c43cbababb083a63811a6ce2b491ec504
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
minor version logs"
This reverts commit 7ec3ab49fb4cfe7bd062507b15c57644d7032726.
The change was done in the wrong place, it only worked for [ChangeLog]
entries. The script actually has an option for excluding Pick-to; it
just needs to be set.
Pick-to: 6.6 6.5 6.2 5.15
Change-Id: I6cc5e929d4f2f9402eb214c87ae40c049f968f3a
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Enable automatic download of Android NDK and SDK for creating
Android PySide6 and shiboken6 wheels. Earlier, the user was
required to manually download it and supply as a command line
argument.
- They are downloaded into the HOME directory of the user into the
folder .pyside6_android_deploy. This is also similar to buildozer
which downloads them into .buildozer.
- The downloaded NDK is set to r25c, same as buildozer. The latest
Android SDK packages are downloaded.
- For the deployment tool, incase the NDK and SDK path are not
provided either through the command line or through the configuration
.spec file, the it will look for the NDK and SDK inside
.pyside6_android_deploy, before falling back to the default Android
NDK and SDK that buildozer supplies. buildozer will download them.
- As a addition, a small code rearranging is also done, along with
changing the deprecated subprocess.call() to subprocess.run().
Task-number: PYSIDE-1612
Change-Id: Ie8d51f8c7634b5b320b1dce2d4164985cbfbaaca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
If a change log exists, log from its last commit to HEAD to get an
update.
Extract functions to get the revision range with LTS handling.
Complements 31f393cc472849ed4556b923f0992203fa14a2a0.
Pick-to: 6.5 6.2 5.15
Change-Id: I67e7e69fcbc2ce7e2fdb62a127fec97e0fb3186a
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
| |
|
|
|
|
|
|
|
| |
On the community repo with the standard v{major}.{minor}.{patch}
tag-naming convention, only option -r is required.
Pick-to: 6.5 6.2 5.15
Change-Id: Ib69b45a07d1b9e3fabaa99e9a561f1769c192ba5
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
version logs
Remove commits with "Pick-to " for non-bugfix releases.
Pick-to: 6.5 6.2 5.15
Change-Id: I1d6456b413e51578a7ac8020df64245a76848d63
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
| |
QtGraphs duplicates symbols from QtDataVisualization causing shiboken
errors. Exclude the now deprecated QtDataVisualization.
Change-Id: Iacdde84189ee87cf4ea058aa635272e187c30fce
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add an option to be able to include examples found in the Qt / qtdoc
repository.
The build_rst_docs target also uses it if --qt-src-dir is given.
It is then possible to include pure QML C++ examples
from the qtdoc and other repositories.
Task-number: PYSIDE-2206
Change-Id: I1b28d5ba5a134101a21fa936f87264a68bada71e
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
| |
Pick-to: 6.5
Task-number: PYSIDE-2206
Change-Id: I64c9862696e9fcb281436aff417d41b96211435e
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
| |
Pick-to: 6.5
Task-number: PYSIDE-2206
Change-Id: I2c6157671e9618b77dd6d4f0c54d986ed819481a
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
| |
Pick-to: 6.5
Task-number: PYSIDE-2206
Change-Id: I7d1c2ebe23cbbad54de4fdda5bd281217e32f2b7
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
|
| |
It is a copy of the QtDataVisualization graph gallery example
adapted to Qt Graphs.
Task-number: PYSIDE-2206
Change-Id: I908312b15324dd030f5610508f13299921fafc26
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
| |
|
|
|
|
|
|
| |
- enables unity build for building Android wheels
Task-number: PYSIDE-1612
Change-Id: Ie13632da64b331a6687874956debbb5db49f6e05
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
- Using patchelf to modify the binaries for rpath changes corrupts
the binary. This leads to binaries not being able to be loaded at
startup by the Android runtime which is required for establishing
callbacks from C++ back to Python.
- Using linker flags -Wl,-rpath='$ORIGIN' -Wl,-rpath='$ORIGIN/Qt/lib'
and disabling patchelf for Android cross compilation solves the issue
Task-number: PYSIDE-1612
Change-Id: I70e74d3ca2b0bc65e2565268c36038eeb7c47ddd
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
for functions
The code trying to change a constructor initialization:
"Foo foo(2);" into "foo = Foo(2)"
also triggered for member function definitions returning pointers
"Foo *Foo:foo()" and many function declarations in headers.
Restrict this by checking for a semicolon and non-presence of some
function qualifiers.
Pick-to: 6.5
Task-number: PYSIDE-1106
Change-Id: I224ac3e7321e57f1c5beecdcdb568a273330a664
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
| |
|
|
|
|
|
|
| |
Pick-to: 6.5
Task-number: PYSIDE-1106
Change-Id: I26ef6c9631c48c1bdde852e3bb3cd222ffec1260
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
|
| |
|
|
|
|
|
|
| |
Pick-to: 6.5
Initial-patch-by: Dennis Oberst <dennis.oberst@qt.io>
Task-number: PYSIDE-1106
Change-Id: Ia8e1dbe33b859ef235db7612f36f2c225ff89902
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
Retrieve headline and use it instead of the standard
"found in dir" text where possible.
Pick-to: 6.5
Task-number: PYSIDE-1106
Change-Id: I869e28f14fe1d6b7f477a1e01284f3fff45f4eae
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
|
|
|
|
|
|
| |
Pick-to: 6.5
Initial-patch-by: Dennis Oberst <dennis.oberst@qt.io>
Task-number: PYSIDE-1106
Change-Id: I76466254b455ac07f8b537e2e758d6720885c128
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Sort the example lists by rst file key.
As a drive-by, also shorten dir names with "advanced".
Pick-to: 6.5
Task-number: PYSIDE-1106
Change-Id: I61a4759b5ed41a3f99e7a2a9955c47f8b3fb3ed2
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
Factor out a function writing one example and a string constant from main.
Pick-to: 6.5
Task-number: PYSIDE-1106
Change-Id: I5a1e7626d327c2424b8ec26f9618225d8bf8521e
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Make it possible to reference code snippets from the example
by relative file names. This makes it possible to write tutorial
examples.
Pick-to: 6.5
Task-number: PYSIDE-1106
Change-Id: Ie95d69c3f98be239e210c9c32b8fc9fb484639f4
Reviewed-by: Keith Kyzivat <keith.kyzivat@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|