aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/cmake
Commit message (Collapse)AuthorAgeFilesLines
...
* Move the QML registration code into a libraryFriedemann Kleint2021-12-082-1/+3
| | | | | | | | | This makes the code easier to maintain. Task-number: PYSIDE-1709 Change-Id: Idb75143a7e6d218637ab75463db88b6135cd4086 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* setup.py: CMake: Remove host python dependency for version parsingAlexandru Croitor2021-12-071-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cross-compiling, the python interpreter found by CMake is the device one (or at least it's supposed to be), which means we can't use it to execute python scripts on the host machine to extract shiboken and pyside version information. Instead of keeping the version numbers in python files, place them into new .cmake.conf files that CMake can include in CMake projects directly. This aligns with storing version information like Qt6 does. setup.py and coin_build_instructions need version info as well, so they will now parse the set() assignments in pyside6/.cmake.conf. Ideally we would have called cmake with a minimal project that outputs those values, but we don't have access to the CMake executable path within coin_build_instructions.py, so we rely on parsing instead. Qt Conan integration does the same, so we should be good, the .cmake.conf file format is unlikely to change and cause breakages. We also modify shiboken_version.py and pyside_version.py to use the new variables when calling configure_file(), because we still ship those files in the wheels. Amends b57c557c8cd1012851f8a245075591dc33be425b Pick-to: 6.2 Change-Id: Icc830069cd459c214ec253840ba6754ece50854e Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Doc: Drop Qt Location from the doc and CMake configVenugopal Shivashankar2021-12-061-1/+0
| | | | | | | | The Qt Location is not part of Qt 6.x anyways. Pick-to: 6.2 Change-Id: I859c782ca795e90fac937544343fa2d07f7dead4 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Add QtQuick3D moduleCristián Maureira-Fredes2021-11-291-0/+1
| | | | | | | | | | | | Adding the module that contains a few C++ classes. Adding the 'intro' example. Adding the 'customgeometry' example as well. Pick-to: 6.2 Fixes: PYSIDE-1708 Change-Id: I0681f087e74c13c024bb1dfa8de545b30f95d7d8 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* CMake: Cleanup documentation building codeAlexandru Croitor2021-11-261-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move conditions on whether documentation should be built inside the doc project, rather than outside. Look for qdoc and qhelpgenerator both in PATH and via find_package(Qt6Tools) calls. Add sanity checks that the various tools used in the add_custom_command calls are actually available. Show a warning or error when they are not available, depending on combination of whether it's a standalone doc build or part of the overall shiboken/python build. Set DOC_OUTPUT_FORMAT to html by default if it's not specified. Clean up some of the warning messages. Make sure to check the result of running execute_process on the snippets tool. Pick-to: 6.2 Task-number: PYSIDE-1718 Change-Id: I2969d7a40961881ad0f91d7142b29a7f4130f3b7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Move from distutils to setuptoolsCristián Maureira-Fredes2021-11-261-3/+13
| | | | | | | | | | This is motivated by the deprecation of distutils, and removal in future versions https://github.com/pypa/packaging-problems/issues/127 Pick-to: 6.2 Change-Id: I16448b69f98df6dc1d9a904b69eb69ed5f1093f5 Reviewed-by: Christian Tismer <tismer@stackless.com>
* PyPySide: check in the rest of PyPy changesChristian Tismer2021-11-121-0/+12
| | | | | | | | | | | | | | | | | | | The PyPy branch has been apart from the main branch for a long time. Meanwhile, almost everything has settled and can be merged into the main branch. This has the advantage of a single branch for both configurations. This project is still not ready. It will be called ready when the Mandelbrot example can be run without any changes. To achieve that, the current threading problem must be solved. The WIP branch is kept. It now holds only the pypy-blog.txt file. Task-number: PYSIDE-535 Change-Id: I317b0e921cc6810e1b76c69991a0f8e592135c65 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* CMake: Dissolve generic cmake_helpers/helpers.cmakeAlexandru Croitor2021-10-272-3/+191
| | | | | | | | | | | | | | | | | | Move PySide specific functions into a new PySideHelpers.cmake file. Keep functions used by both shiboken and pyside in a renamed ShibokHelpers.cmake file. This brings the CMake file structure more in-line with how it's structured in Qt6 itself. TODO: Ideally the pyside subproject should not include the shiboken files directly, but rather have access to those functions as a consequence of calling find_package(Shiboken6). Pick-to: 6.2 Change-Id: I954d8be0df86a45e74b6011f8e2758026f3340fa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* CMake: Move non-add-subdirectory related code to PysideSetup.cmakeAlexandru Croitor2021-10-271-0/+225
| | | | | | | | | And tidy up add_subdirectory conditions in pyside6/CMakeLists.txt Pick-to: 6.2 Change-Id: I0549c88eef0ed8497d2e410f382c3e653ab38f94 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Revert "PySide6: Fix missing includes in QtWebEngine"Friedemann Kleint2021-07-211-7/+0
| | | | | | | | | | This was a workaround. This reverts commit 096e64ba2e866abf773f0fab3b72bf48012261f7. Change-Id: I1b1baf8de73bdb235c21ed673893d4e3a0f5054e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com>
* PySide6: Fix missing includes in QtWebEngineFriedemann Kleint2021-06-231-0/+7
| | | | | | | | Temporary workaround, to be reverted later. Task-number: PYSIDE-1570 Change-Id: I113c82236ebeebd3a0ecd31dbcecbb7704dc8d7c Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Refactor macro create_pyside_module()Friedemann Kleint2021-06-041-28/+31
| | | | | | | | | | | | | | | | | | | | | | - Introduce a list variable shiboken_command to which elements can be appended, avoiding empty options (--drop-type-entries) - Use the include directories from Qt6::Platform instead of the global QT_INCLUDE_DIR since it also has the mkspecs directory containing qplatformdefs.h. - Introduce list variables for the shiboken include directories and framework include directories as an extension point where other directories can be added. - Remove old workaround for qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2. - Move positional arguments (global header and typesystem) to end of argument list. Pick-to: 6.1 Task-number: PYSIDE-802 Task-number: PYSIDE-1568 Change-Id: Id4d020a163c79010616749701251891545858447 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* move "shiboken6/shiboken6" to "shiboken6/Shiboken"Christian Tismer2021-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Modifying the paths to work in the new way is a quite ambitious task. But doing so improves the overall project structure and makes imports unambiguous. This patch should not be applied alone but with move "shiboken6/shiboken6" to "shiboken6/Shiboken" temp The reworked version of this patch no longer has different structures in `build` and `install`. Tested with Python 3.6, 3.7, 3.8, 3.9 debug build Python 3.6 debug install Python 3.9 release install Task-number: PYSIDE-1497 Change-Id: Id9d816dd825907f9359651e7e2f69f54e1ba46c9 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Rename PySide2 to PySide6Friedemann Kleint2020-11-023-0/+289
Adapt CMake files, build scripts, tests and examples. Task-number: PYSIDE-904 Change-Id: I845f7b006e9ad274fed5444ec4c1f9dbe176ff88 Reviewed-by: Christian Tismer <tismer@stackless.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 07:13:41 +0000