| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Collection of bits and pieces to enable MacOS universal
wheel creation in Qt CI.
Change-Id: I0a889258ec4f89ca3a26c8bf2ee76f0d5c676a7a
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
| |
Pick-to: 6.2
Change-Id: I36303943a6559ad7ff20e54478ec93a2d997651a
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 192909a77f9c8caa4cd6d24987761fbca7ea199e)
Reviewed-by: Simo Fält <simo.falt@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The build scripts used a reimplementation of ldd to determine
library dependencies in case ldd is not installed which may
fail on recent systems.
Try ldd first and fall back to the reimplementation only
if it fails.
Change-Id: Icca16c2fae0ce6086284eb0194a28d8ec32daae6
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 2b1cc890293592c9f40dcc14119b726886a20fe8)
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
| |
Undo wrong changes related to the Qt/resources copying.
Change-Id: I8ce54cce07a3aeceb9ae4621dd2512ecb2a6c1d1
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The command --build doesn't properly work when trying
to do a standalone invocation, and complains
that it's an unknown argument, since that's meant
to invoke a build with ninja, make, etc,
and not to get information related
the path of libraries, -B should be used instead.
Fixes: PYSIDE-1556
Change-Id: I4e64477032beba75c1210cb29093465f1c85bb6c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 58ac9b4ca4e67db1480c03f3fc84948d2dcb793f)
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
| |
Change-Id: I97b323d5055c30f782f62b85e734eb9f0e33f7b3
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 2fb82b5cd3ee1db9234e038759bd0e3cda9ca40b)
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After the major problems are solved in
py3.10-prep: re-implement zip import
py3.10-prep: reset the type cache after feature switching
py3.10-prep: Fix parser.py for changed typing module
, there are only some minor changes left to do. One thing
is still not clear:
* Unsolved: In time_test.py, the last two tests work but
crash at shutdown.
It is not yet clear if this is a PySide or Python error.
This will crash Python 3.10 if not solved until the release.
[ChangeLog][PySide6] Support Python 3.10. This is by 99% solved.
Looking for a crash with unknown origin.
Fixes: PYSIDE-1436
Change-Id: I94cffa7ed16a2651e09924fe5babc188b1b4c2b8
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 81e9cff884d6b03cdf64a5dd6ec6564d99177e0c)
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The typing module has subtle changes that are not even
documented: Typing types now have a __name__ attribute.
That confused the parser of the pyi generator because
suddenly stingizing
Callable[..., Optional[str]]
resulted in
Callable[..., Optional]
because of special rules that return the generic name
of a typing type, which was very unexpected. Finding this bug
took a lot of debugging of the recursive `_resolve_type`
function.
We finally move the debugging_aid string as a function into
lib/tool.py, because this was very helpful.
Some changes are not valid in 5.15, because there were other
modification in 6.x source code, like f-string, and some Qt install dir
struncture, like Qt/resources.
[ChangeLog][shiboken6] The parser for .pyi files needed an update
because of undocumented changes in typing.py for Python 3.10 .
Task-number: PYSIDE-1436
Change-Id: I3b8f2c1aa52a23014a8a915a0c677af96dfc536f
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 2530cb3f165ac02b8f7132e3f5ab4f7f6896dbd9)
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Even when using the code, some portions
of the cmake file in sources/pyside6/doc/
was still being executed.
This makes sure everything is skipped if we use
the '--skip-docs' option when building.
Change-Id: If78b19b9650b61b642e447b8c96b814e82994d7c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit fbbae556c9bf060be366fd578986cae85ff8caec)
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Python v3.6 and docutils v0.17 have an encoding problem,
because the default encoding is ASCII.
That produces an encoding error on macOS in Sphinx:
Running Sphinx v3.5.3
Encoding error:
'ascii' codec can't decode byte 0xc2 in position 69: ordinal not in range(128)
The problem happens on macOS because CI uses that old version.
It can be avoided by setting UTF-8 encoding.
Change-Id: I88ee27cfb529dfec291dc079bcc2d52f656f180f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 2f88c10f824fb9aa6cb1dbfd18b2d071a48745f1)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
It produces an encoding error on macOS:
Running Sphinx v3.5.3
Encoding error:
'ascii' codec can't decode byte 0xc2 in position 69: ordinal not in range(128)
Change-Id: I522fbdb8a765a7e17821ef7ff306aaae5744a42c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
| |
Change-Id: If990cb45c2187cdfda5c41ea8b8123d803fa8934
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 63614c3085fa8105e9f8ced6b2d166c2a7a2c6e6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Move the logic expanding the Clang-related variables introduced by
c3fc507d3b2a502273bd92472e1e7aa459c2d13e to the COIN scripts since
they are needed when building the sample binding.
c3fc507d3b2a502273bd92472e1e7aa459c2d13e should then be reverted.
Task-number: PYSIDE-431
Change-Id: I1f118fdbd8989b7b9e3d24a249af81f4020c73f3
Reviewed-by: Simo Fält <simo.falt@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Other commands, such as configure, do not support it.
Amends 0a00958b083008dea340ef78b0f235ca49b7d22c.
Change-Id: I5dbcea6aea60e027a8ff15d10351edbeaefdf338
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit b12c71b9c1fd9723f30329dc8c16a63d4e5eb80b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
cmake tends to auto-detect the clang compiler from the path
and then fails the build. Force it to use cl.exe.
Change-Id: Ic58cc0e734dd42bba0ad383842ef73f23de50c76
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 57a0bc2c066624717e5980657b03c1c0e46513dc)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Do not add -reuse-build, which it cannot handle.
Amends ff5a96c49e2aa5347c1c9892aad33c591e931639.
Task-number: PYSIDE-807
Change-Id: I96ab03b95dd7762b1a16f2acc5d8ca31555ef1a3
Reviewed-by: Alexander Volkov <avolkov@astralinux.ru>
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 0a00958b083008dea340ef78b0f235ca49b7d22c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Import Setuptools before Distutils, fixing:
distutils_patch.py:25: UserWarning: Distutils was imported before Setuptools. This usage is discouraged and may exhibit undesirable behaviors or errors. Please use Setuptools' objects directly or at least import Setuptools first.
Change-Id: Ibbc1a5cd1d348f6f44f7e80a3ba7e9a7341fae8e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit b70183a78ed7a478ae9f2af19bd84535a8e69320)
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The import was removed starting from v0.35
in favor of the packaging module and other
functions that are not placed in 'bdist_wheel'.
Fixes: PYSIDE-1385
Change-Id: I97f5dbf9867f779a897d9041489831255ea54b67
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 56c37b3b95968b24bfb737698c0a4ca94d0b8802)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
| |
Task-number: PYSIDE-807
Change-Id: Ib2369887bafc61971ffa500427ec85c1cd73c2b2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since the try failed, there was no option to import DistUtilsCommandMixin
and then a:
NameError: name 'DistUtilsCommandMixin' is not defined
and
AttributeError: type object 'type' has no attribute 'user_options'
was raised.
Task-number: PYSIDE-807
Change-Id: If5aa37ce9928a5c029b21decc24bd2bccf9b4dc4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Move some options to a command mixin. This cannot be done for all
options since some determine the package name and need to be known at
before instantiating the commands. Print an additional help text listing
them.
Fixes: PYSIDE-807
Change-Id: I43adb09db16f74af037bfb754cad2c0f5cfe43be
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The function produces a warning about a too-high cyclomatic
complexity. Factor out functions to retrieve the make program
and the Python library.
Streamline the code to avoid repetitive find_executable()
invocations and unindent the multi-arch code.
Change-Id: I7aac9bc1324e57878e97d81b3e0424f055f7f2b9
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
| |
Fix spaces around operators, missing lines, import order.
Change-Id: I05ecafec849578fed6018654fcefaa008b6801e8
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
PysideBuildWheel
Constructor parameters depending on option values create a problem
for introducing per-command option parsing.
To fix this, split utility functions used by the commands
in main.py and PysideBuildWheel into a separate wheel_utils.py
Task-number: PYSIDE-807
Change-Id: Idabd3ba03726d2284e80234fc8485b70e6eb20ca
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
| |
Run only the pyside build when help is requested.
Task-number: PYSIDE-807
Change-Id: I0aa5bf2db0a6a7e6e32a66357efd200af70dd653
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
- Turn it into a singleton.
- Move the qtchooser resolving code into QtInfo.
- Delay-initialize the dictionary.
Task-number: PYSIDE-807
Change-Id: I3be2f3d0e0e9bc8aa61e1ec90ea37f7078c7f0bb
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
| |
Check for "yes"/"no", consistently.
Task-number: PYSIDE-807
Change-Id: Id9f2ba125acb9ea8e811fd6cb5994bbb070605de
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since the process to get the documentation built
is to build the whole project, that is too time consuming.
Additionally, using qdoc on the Qt API takes a lot of time.
This patch introduces the setup.py option called 'build_rst_docs'
which skip the general build, and only generates HTML documentation
based on all the .rst files we have for shiboken and pyside.
To use it:
python setup.py build_rst_docs
The build will throw warnings related missing directories, and files,
which are generated on the 'qdoc' process, but since they are skipped
they are not present.
Some missing references warnings are skipped due to also come from
the qdoc-based step.
Task-number: PYSIDE-1106
Fixes: PYSIDE-1390
Change-Id: I4118fd3b64e217717df6cae093138f6951d37094
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
| |
Change-Id: I17726f6bd02d36a7acc3ed99ca11796b780b837d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
| |
This causes problems on Windows where old
python3 versions are shipped with Visual Studio
and virtualenv does not create a python3.exe.
Change-Id: I695fbcd7a007ff72bd4d79399c700bf93a8e4f94
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
| |
Change-Id: Ic430a687a6d7af7ba45df51a34c6fe7c56b3799d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 275aba0c773e649f15c89e34f15310cb8fd35c09)
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
This was merged with "WIP: Enable support for Python 3.9".
There were minor problems, only.
Thanks Cristian for adding cosmetic changes which should already
have been applied in Python 3.8 or earlier.
Change-Id: Id5e8696d9cfb7192243ad44c93e9f2cf347d6a7c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
| |
Use the relative path for git as git submodule foreach (as invoked
by "clean") does not work with spaces in the path on Windows.
Change-Id: Ia53e8ef9a48c88fb3159bf961da4798216422f3c
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
| |
Move rstrip() below read check.
Change-Id: I56333b813aaa8608296e8f8e3181bacf10d2f63f
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Fixes: PYSIDE-1323
Change-Id: If3a3d885f277044d64e174dd597974ad11a3425a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 80d07788fbf4cdce72041b1d22a66e5f981034a1)
|
|
|
|
|
|
|
| |
Fixes: PYSIDE-1323
Change-Id: I2856c5388b66eb02b18004b894cac8db6c4be10a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 0467ea1c3ddbf81fe4ab9a5c521e1d41ea22481f)
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Adding STATUS or WARNING to a couple of message() calls.
* Replacing some print() by log.info()
* Changing some '*' by '-'
* Align configuration outputs to check paths easily
* Adding big message to check when shiboken2/pyside2 is being built.
* Including the cmake_minimum_required() function instead of an 'if'.
Change-Id: Idb6c5797286d400192d083403063e2ae582e3fe6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
A new command-line option, --doc-build-online, enables
to choose online builds, otherwise offline docs are
built by default.
Change-Id: I34ef8a22ef3bd321bd972c4f2873e4321c9c336a
Fixes: PYSIDE-1292
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
| |
Renaming pre_release_version_type to release_version_type to match its
future usage to differentiate between wheel/package types.
Change-Id: I70a2361f639a36b17f63b7f76d8c231a144bd825
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
According to PEP 561, there needs to exist a py.typed file.
Also, the import of typing must be visible statically for mypy without
importing PySide2.
Testing.. run
mypy pyside_1100.py
and you will get the correct output without "any".
Change-Id: I1d08447161630a8c7a64eda32ff8a431e994c6a7
Fixes: PYSIDE-1100
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
The build_scripts are able to build Designer, optionally.
For macOS, the optional status was forgotten.
Instead of always patching the build_scripts, I finally
fixed that buglet ;-)
Change-Id: Iaa62e27253ec7035f0eebde17f0f2b8c4593be67
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
| |
This is useful for mimicking the COIN test environment.
Change-Id: I9a4567be171d940d6574c4135fabb2a8721bbd79
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
| |
Change-Id: I682fb765fc3f69f0ca3c4d6717d415d0bff0517e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I happened to try out the "cling" C++ interpreter. That forced
me to install XCode. I did not run XCode because cling worked
immediately.
But then, building PySide always failed with an error in qtinfo.
This is a rare trap into which I fall every other year, so here is a
fix that returns the intended error message.
Change-Id: I9ec5774c49b8a186d6b4247150dac6b252e7cc64
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
| |
Available as of version v0.96.74, it speeds up things considerably.
Change-Id: I5d8312b2d59adcce0881d3485af966bebf69317b
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
| |
Run the test redirected into a log file with time stamp.
Change-Id: Id9a5047e0b6594760d0329f9a15450c688a585f8
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
With virtualenv 20 we have the case where the first
path in the PYTHON_LIBRARIES cmake variable was wrong:
a_virtual_env/libs/python3.lib
so the python code inside the helper didn't have a proper
check if the file was valid or it was just a wrong construct.
Additionally, the 'prefix' variable will contain the virtual
environment directory location, which will not contain the 'libs'
directory, because that's included in the system's installation path.
To solve this, we use the 'INCLUDEPY' directory, which is correct
as a base to create the real 'libs' one.
Task-number: PYSIDE-1231
Change-Id: Ifca08d74c49cd57572836a087edb96c089266dc7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix coding style warnings and bring it up to par with the qt6_tool
in the works:
- Add edit config file option
- Add dry run option.
- Add support for Incredibuild
- Log build time
- Print help if no option is given
Change-Id: Ia8ec5f0d4d9e9c127172fb22f3efea11ce1ab6ff
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
| |
Designer is not statically compiled, so we need to add
a RUNPATH to use the Qt libraries we ship with the wheel.
Change-Id: I715fcd852b63da99104198be2a4587b042a1eab7
Fixes: PYSIDE-1165
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|