| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
| |
Amends abcc61de2829b2ac191bf334005a3c10a68cbe2f.
Pick-to: 6.5
Change-Id: Ia1226b219c4092f315fe9e3c2e236b54e6b8280b
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
| |
These files that are available with the Qt installation enable us
to find all the Android permissions and Qt dependencies required for
each module
Pick-to: 6.5
Task-number: PYSIDE-1612
Change-Id: I6df41f1456ccd226f5df0cfd17022f337f5d2198
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.5
Change-Id: I21ae563efb9488083289c7deb6435ae7e9405049
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Amends a48de6afbf127831aa46c1c006d777861bbbe9cb
- Simplify the developer doc for adding new tools
- Make build_scripts/__init__.py the primary place to add new tools
for the build process
Pick-to: 6.5
Change-Id: I1e8bd9e069471bf51a186c067773d7fbc2588769
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.5
Change-Id: I584eb3a40853ae63494d9ea053abf8f6b382a538
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
| |
This allows for removing hardcoded plugin information.
Pick-to: 6.5
Change-Id: I20527fb16f35dd6bad1d81c01376132829539ff3
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.5
Change-Id: I147609680589019c6db9dc13add64bf3e0dbab94
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
There was a fault in logic that determined whether to download the 7z
file that contains opengl32sw.dll.
Fixes: PYSIDE-2289
Pick-to: 6.5
Change-Id: Ib11afbacd23ff6ee4c85e8dfce942d1d72916807
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The construction
start_time = int(time.time())
def elapsed():
return int(time.time()) - start_time
is unfortunate since it increases the variance without reason.
Change-Id: I5fcd87a2ca3559113aacd3f415b952929c2155fe
Pick-to: 6.5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
|
|
|
|
|
|
| |
Change-Id: I52ce8b449e5a0c4f1d94872becaa391c1c9ae605
Pick-to: 6.5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
- designer, assistant and linguist were not existing due to a
regression from 43109854a2966afe2e0cf29961157a6f54d5775c
Pick-to: 6.5
Change-Id: I7f92ab2eca2fd98eb049e8e81a9efa56ebec3459
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Preliminary support for PySide6 Android deployment
- Uses jinja2 to create PySide6 and shiboken6 recipes, to be used
by buildozer when python_for_android builds the app distribution
- Classes for Buildozer config interaction
- Run deployment to android. Typical command looks like:
"""
pyside6-android-deploy
--wheel-pyside=./PySide6-6.5.0a1-6.5.0-cp37-abi3-android_x86_64.whl
--wheel-shiboken=./shiboken6-6.5.0a1-6.5.0-cp37-abi3-android_x86_64.whl
--name=stringlistmodel
"""
- New entrypoint for pyside6-android-deploy
- Helper functinos for Android Deployment
- Remove unused function main_py_exists()
- Added the new files to deploy.pyproject
- Remove dry_run argument from install_python_dependencies()
- new Python packages added in requirements.txt to enable the
deploy and cross compile tool
Note: python-for-android uses my local fork. This will be changed
once it is merged into python-for-android dev.
Task-number: PYSIDE-1612
Pick-to: 6.5
Change-Id: I7eb96fa5507a476b4e86ec0195a5e9869f0f85fd
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
- Amends 452eac0702688a74539d2e66be07d6f322aa11ab
Pick-to: 6.5
Change-Id: I1a6c9c68f689e1ccd875fad8ab2dda0de5fd1f0e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
Amends 7565650d84b27784d4945ede0f5ba5a5cb93f926.
Task-number: PYSIDE-1106
Pick-to: 6.5
Change-Id: Ie958f5d6ac42a742c2ab8e9652703cc61a64745b
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
To reduce the size and cluttering of wheels and installations
the examples are not including any longer.
The recommended way to get examples now is to download them
directly from the Example Gallery in the documentation page.
The option no-examples was removed.
[ChangeLog][pyside6] Examples are not included in the wheels anymore
and the option no-example was removed.
Change-Id: I94fb24f9ffd6c55e2762e7c2e380b0f0ffe0bf61
Fixes: PYSIDE-2247
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
Allows for checking the example pages right away.
Task-number: PYSIDE-1106
Change-Id: I38b55415116739a0610e8600a7b9bcb3a7d2835b
Reviewed-by: Keith Kyzivat <keith.kyzivat@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
- Create Qt6AndroidBindings.jar from all the main entrypoint Android
Qt classes.
- Add Qt6AndroidBindings.jar and other relevant Qt Android jar files
added to PySide6 wheel
Task-number: PYSIDE-1612
Change-Id: Ie212dd65a844b7c174acc33c43108d0b5fc3cbb7
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
| |
Task-number: PYSIDE-1612
Change-Id: I3a4747f14c932f23ab37d981713d7bbb34cba611
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- basically controls what goes into the android wheels
- presently restricted to Qt essential modules
- controlled using the --plat_name=android_aarch64,
--plat_name=android_armv7 etc
- the libQt6*.so libraries in Android do not have the version in the
end.This is the same for all the Android Qt installations. Hence we
look for libQt6*.so* instead of libQt6*.so.?
- folders like 'glue', 'typesystems', 'support' are not relevant for
for cross compiled wheels because shiboken6_generator is not cross
compiled
- for Android cross compilation, the 'examples' folder is also not
relevant in addition to the above folder
Task-number: PYSIDE-1612
Change-Id: Icc7561a6e990ed9b080f55cb30bac34e4774be7f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Instead of calling setup.py to re-use binaries and creating wheels
we can call create_wheels.py directly from CI instructions. This
enables us to sign Windows binaries in correct phase and directory.
Pick-to: 6.4
Change-Id: I7c69abe6e0b6591fb1df1e2f2805a015a49ce944
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It seems that the previous changes:
bf73772d2c43a71d13a55e9914c631591cd01815
to determinate qtpaths earlier in the build didn't
consider the case where
setup.py build_rst_docs
was called with qtpaths in PATH, so this skip the process
for this subcommand.
Pick-to: 6.4
Change-Id: I89a28950a6416993ece204cc1b2eb3300165a272
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
PEP 440 requires that local version segments be delimited with a + sign.
Pick-to: 6.2 6.4
Fixes: PYSIDE-2229
Change-Id: I87f243b6cc5e036a23f2ec7235e9f35347a789eb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Add new enums
- Hide field QMetaMethod::mobj made protected by
qtbase/0b701ec0cd86afbf6bb0d0abb361cfb6500c2e1b
- Adapt to PDF qtwebengine/6769bd1544c56a514fe35bf16d05614605a49bea
- Adapt to qhttpserver/55d10201dc7a47b239825548e053c1fb0de61115,
adding a virtual method with rvalue reference to QAbstractHttpServer
- create_wheels.py: Adapt to changed location of the metatypes directory
in Qt after qtbase/4234ce12dc819b9ca76c8dc4c251f5bd4fe0bc9c.
- Adapt error column in QDomDocument test
- Fix QMetaObject::invoke() to work after
qtbase/fe92b080658f0d8609e2a2a69e5ec2b51dd7bf9d by making the
cast of the helper types to Q(Generic)ReturnArgument explicit
in the snippets
Change-Id: Ifb514878e999ad4c9ef00ff83172626eff112a3d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 'qtpaths' needs to be known while setting up the corresponding
setup.py command to ignore the pyside qt wrapper tools whose qt tool
does not exist
- This is an extension to 43109854a2966afe2e0cf29961157a6f54d5775c.
The aforementioned patch led to qtpaths being found 2 times, once
inside CommandMixin class and also much before that inside
SetupRunner.run_setup(). This redundancy is now removed by moving
the finding of OPTION['QTPATHS'] outside the mixin and before
CommandMixin object of the command being run is initialized
- the help commands, build_rst_docs and cross compilation command
should not complain about qtpaths anymore
- fixed cross compilation build
Task-number: PYSIDE-2195
Change-Id: I862baf954dea0a3bdaf5ddf411f119178b457c42
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
| |
- convert PosixPath to str, for the modified line
Change-Id: I358eba0af939726615ece3874de1852299e735ca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Removed the "quiet" and "verbose" older approach,
and introduced a 3-level configuration so we can switch
between them depending of the amount of output we need.
By default, the log level is set to INFO,
but it can be changed to VERBOSE and QUIET.
The older "--verbose-build" and "--quiet" options were deprecated.
The new way for setting the log level is:
--log-level=quiet
--log-level=verbose
--log-level=info (default)
The default option was made less verbose, controlling the output
of the logging module, and cmake:
for verbose it uses DEBUG, quiet uses ERROR, and no option uses INFO.
Change-Id: Ida0289e3ea0ed09b7489a7513254137bba186fd0
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
| |
- some regression from 2afcf8e7545c681e412e5b6d04ab8867e5edd5c7
pathlib changes
Pick-to: 6.4
Change-Id: I32173bdffc1280e23b11006466f3dfb19a49fd8f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Fix a problem where the MSVC DLLs would only be copied into the
shiboken6 directory of the wheel and not the PySide6 directory, leading
to missing DLL errors on clean Windows installs.
Pick-to: 6.2 5.15
Fixes: PYSIDE-2162
Change-Id: I4c07275906a292e4f314ab68231148664af70c4e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
Remove unused _vars argument in copy_msvc_redist_files().
Pick-to: 6.2 6.4 5.15
Task-number: PYSIDE-2162
Change-Id: I9bb28dad335e1349ceebfd9b0e0672b9d890bcc5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently, PySide bundles MSVC DLLs (+ others) sourced from a very
outdated self-hosted archive. Best practice would be relying on the
redistributable package and installing it if necessary, but we cannot
assume that the user has the required admin rights. As a compromise, the
bundled DLLs are now sourced from the CI machine, which is assumed to be
kept somewhat up-to-date, at least on a better cadence than the current
3+ year old archive.
These non-MSVC DLLs are no longer bundled as they are pre-installed on
Windows: d3dcompiler (part of DirectX) and ucrtbase (Microsoft C Runtime
Library). Only opengl32sw continues to be sourced from the self-hosted
archive.
Pick-to: 6.2 5.15
Task-number: PYSIDE-2162
Change-Id: I6495f6953cd1c3e78a9777d24ee54e429a63d3d9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
- to distinguish between deploy.py and deploy folder, since both
are Python modules. This is especially useful when testing since
our tests are located in sources/pyside6/tests/tools.
Task-number: PYSIDE-1612
Change-Id: Ideb35b23f454ec64415421e00464cfb1f7055401
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
[ChangeLog] An option --unity has been added to setup.py enabling
enabling CMake UNITY_BUILD (jumbo) builds, which speeds up building.
Fixes: PYSIDE-2155
Change-Id: I235a18335d6070bc3eb4ea7f9953925f6d9e174c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
These functions are not used in the build_scripts
nor the coin, provisioning, test, or anywhere else
in the repository.
Pick-to: 6.4
Change-Id: I07fd343b1954f76e2c37b0aa8cc3c43662159d27
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Many leftovers from the pathlib migration patches.
Pick-to: 6.4
Change-Id: I7126fadbe45dbb387bc8948ba777cb690f10a758
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
When launched from a subdirectory:
File "pyside-setup\build_scripts\qp5_tool.py", line 392, in <module>
if str(cwd) == '/' or (IS_WINDOWS and len(cwd) < 4):
Amends 84bcb12d69bb24869f263839c26a13c858ca050d.
Task-number: PYSIDE-2080
Change-Id: I4be4296c19258b5f5407053215e46ef0b262e4f3
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The code was not triggered since the build system tries to compile
a small test project with Ninja before even reaching it.
It was also using code for MSVC 9 (2008) which does not work anymore
and causes deprecation warnings:
setuptools\_distutils\msvc9compiler.py:34: DeprecationWarning:
msvc9compiler is deprecated and slated to be removed in the future.
Please discontinue use or file an issue with pypa/distutils describing
your use case.
Change-Id: I95a6b7700c13873884deb6186e78d6c520c592de
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
|
|
|
|
|
|
|
|
| |
Amends 2afcf8e7545c681e412e5b6d04ab8867e5edd5c7.
Task-number: PYSIDE-2080
Change-Id: I8d9d26ca772d1f380da34d31ac5511698b554a9b
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
| |
Change the default generator to Ninja, so that other values
cause the option to be set.
Pick-to: 6.4 6.2
Change-Id: I97e6d0f87ab7143d8617892a94aab17175b83f41
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
| |
Introduce a helper to find shared libraries and change the functions
to use Paths.
Task-number: PYSIDE-2080
Change-Id: I0b2e4c4c21f9810f6b45986c784d050fbf7a8058
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Make it possible to pass a Path or a str to copyfile()/copydir() for
both arguments or one of them. Turn the variables destination_dir,
destination_qt_dir and destination_qt_lib_dir introduced by
b32a791ea2c66ae9ef2896ea445d4752e4773f96 into Paths.
Task-number: PYSIDE-2080
Change-Id: I13b27179746019b9cbe575d783a67a025dac1ee5
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Use a context manager to dispose of the process properly
and remove Python2 code path.
Pick-to: 6.4 6.2
Change-Id: Ibad035078433a75a944dc10f49f404e9e63614af
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
| |
metatypes are now located under arch_data after
qtbase/4234ce12dc819b9ca76c8dc4c251f5bd4fe0bc9c.
Allow for a smooth transition by adding a version check.
Change-Id: I15e4d560d4a93c7d2e6f737f6f303fcc0c6a678b
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
It simplifies the code and paves the way for using identical
directories on the various platforms.
Pick-to: 6.4
Change-Id: Id50d06f100f13c83ea40b475dcf1a05a08ffa3bd
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
| |
- Amends c242f3509ce43ce50cb5931f3e98c214d34cba51
Change-Id: Ib5f94f2ef8f01e798db16121569fcd73afcf2cb0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
| |
- libexec path corrected
Change-Id: If9ad69ffc6742aca57cb5f057ee6814e91a9a61d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.4 6.4.1
Change-Id: I0a79956a344893ca21e2ee80cd642ee31bb904c0
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
| |
- added missing comma in windows_desktop.py
Pick-to: 6.4 6.4.1
Change-Id: I082443696ba8dfef99851d7d8fd115b1dcef203c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Fix check in error message introduced by
72107fc39f15e3827297530dfad3c63f8e4ffcaa.
Pick-to: 6.4 6.4.1
Change-Id: Ie6690d84d5f6aa83ebcca8517b90627ecce4b746
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
| |
Amend e52b2c9ed9bb86042811b36a910f79dd94fbe0cc
Change-Id: Id1d2d964494c7c03baab43769cc4516a3332aa63
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use os.fspath, fixing:
File "pyside-setup_was/build_scripts/main.py", line 391, in run
f.write(self.install_dir)
TypeError: write() argument must be str, not PosixPath
Amends 2afcf8e7545c681e412e5b6d04ab8867e5edd5c7.
Task-number: PYSIDE-2080
Change-Id: I553978d3a53da1e2d2435f8f871baaa8196edc4c
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
|