aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Cleanup documentation building codeAlexandru Croitor2021-11-261-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. 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> (cherry picked from commit 39f47bc8f61e8986a729a153cba619761bacc280) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Move non-add-subdirectory related code to PysideSetup.cmakeAlexandru Croitor2021-10-281-234/+8
| | | | | | | | | | And tidy up add_subdirectory conditions in pyside6/CMakeLists.txt Change-Id: I0549c88eef0ed8497d2e410f382c3e653ab38f94 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit d00dec4db10a2ab74bb26d8a6686ff2c007903a1) Reviewed-by: Christian Tismer <tismer@stackless.com>
* CMake: Search for shiboken package in the PySide project earlierAlexandru Croitor2021-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | When doing a pure CMake build of the PySide project (without setup.py), configuration would fail with CMake Error at CMakeLists.txt:49 (message): Could not identify PySide6 version. Error because the project expects the PYTHON_EXECUTABLE cache var to be set to a valid value. This value is usually passed by the setup.py script. Move the find_package(Shiboken) call before the version detection code. This allows not passing an explicit PYTHON_EXECUTABLE cache var because the Shiboken package will set it. Change-Id: I97d7cae07711be17c2390ac0f9db835b8d74e771 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 6dc98da382f0a6f2abf9cb48497f595073ad0f07) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Move shiboken_helpers into new cmake subdirectoryAlexandru Croitor2021-10-271-1/+1
| | | | | | | | | | | In preparation for more code to be moved under the cmake subdirectory. Change-Id: If52c7a8d34fc0e34334c1caec1b7f9f1ee005908 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit c72947a35f80d94a08d788249773f1c32ef7a7de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use conditional processing in the type systemFriedemann Kleint2021-06-091-1/+0
| | | | | | | | | | | In CMake, remove the AUTO_OS variable from the check_os() macro. Fold the macOS/X11 type system files of Qt Core into the common type system file. Task-number: PYSIDE-802 Task-number: PYSIDE-1568 Change-Id: Ib751f40fbf7eca8fe4d08270db4fbc1e938323c5 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Remove QtX11Extras, QtMacExtrasFriedemann Kleint2021-05-171-1/+0
| | | | | | | Task-number: QTBUG-83251 Task-number: PYSIDE-1568 Change-Id: I36117d83f51b708882c1283c3a16528fcb5384e2 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* cmake: bump general Qt minimum versionCristian Maureira-Fredes2021-04-071-1/+1
| | | | | | | | | | The main cmake files for pyside/shiboken still have minimum versions pointing to version <6.0.0 which is not valid anymore. Pick-to: 6.0 Change-Id: Iffebec1e6782e627fc6b3a0c9e16bce7864e250f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* doc: make sure '--skip-docs' skip the docsCristian Maureira-Fredes2021-04-061-1/+1
| | | | | | | | | | | | | 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. Pick-to: 6.0 5.15 Change-Id: If78b19b9650b61b642e447b8c96b814e82994d7c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* PySide6: Add a Designer pluginFriedemann Kleint2021-02-161-0/+1
| | | | | | | | | | | | | | Add a convencience class QPyDesignerCustomWidgetCollection to the Qt Designer module, which provides functions for registering widget types or adding QDesignerCustomWidgetInterface instances. A static instance of it is stored as a dynamic property on QCoreApplication, which is retrieved by a Qt Designer plugin, which provides the collection of widgets registered in Python. Task-number: PYSIDE-1455 Change-Id: If4055e6c9db6a03b32016b013a1130051bbd472a Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Switch from os.path to pathlib.Path, all source changes but testsChristian Tismer2021-02-101-1/+1
| | | | | | | | | | | With this patch, os.path in Shiboken and Pyside will be completely removed from sources. The rest will be done later. Task-number: PYSIDE-1499 Change-Id: Id01782779487ceec62efdd1f32f65beee0234338 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* PySide6: Move the static UiTools plugin into a subdirectoryFriedemann Kleint2021-02-051-1/+1
| | | | | | Task-number: PYSIDE-1455 Change-Id: I5d919f6a1d98cd1c6109b33c7e83b1ce97f50218 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Fix Qt include dirs in case of frameworkSimo Fält2020-12-091-5/+2
| | | | | Change-Id: I6937f40ebf85e1d2d1be53e63b0eebbaa7cbf0fa Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Rename PySide2 to PySide6Friedemann Kleint2020-11-021-0/+266
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 2024-06-08 16:55:18 +0000