aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2-tools
Commit message (Collapse)AuthorAgeFilesLines
* Update pyside2-tools submoduleFriedemann Kleint2019-08-151-0/+0
| | | | | | Task-number: PYSIDE-1035 Change-Id: Ifbd5b2c586901573f466ba0016bc80b0534595df Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update pyside2-tools submoduleFriedemann Kleint2019-07-021-0/+0
| | | | | | Task-number: PYSIDE-1020 Change-Id: I17e517e0b03d717b5f38c14900feafbf9099d37b Reviewed-by: Christian Tismer <tismer@stackless.com>
* Update pyside2-tools submoduleFriedemann Kleint2019-05-271-0/+0
| | | | | Change-Id: I9912a656bd8de84d26e8e59d8dc0a6483cbcd4b7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Modernize cmake buildAlexandru Croitor2019-02-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a CMake super project that includes the shiboken2, PySide2 and pyside2-tools subprojects, so that it's possible to build everything from Qt Creator (or any other IDE that supports CMake) with minimal set up effort, and thus inform the IDE CMake integration of all relevant files, for easier code editing, navigation and refactoring. This also lays the foundation for allowing 3rd parties to use the shiboken2 generator to generate custom modules. This is achieved by eliminating various hardcoded paths for libraries and include directories. Start using CMake targets throughout the build code to correctly propagate link flags and include dirs for libshiboken and shiboken2 executable targets. Same for the libpyside target. Generate two separate cmake config files (build-tree / install-tree) that can be used with find_package(Shiboken2), to make sure that the PySide2 project can be built as part of the super project build. This is currently the only way I've found to allow the super build to work. Note that for the build-tree find_package() to work, the CMAKE_MODULE_PATH has to be adjusted in the super project file. The generated config files contain variables and logic that allow usage of the installed shiboken package in downstream projects (PySide2). This involves things like getting the includes and libraries for the currently found python interpreter, the shiboken build type (release or debug), was shiboken built with limited api support, etc. Generate 2 separate (build-tree and install-tree) config files for PySide2, similar to how it's done for the shiboken case, for pyside2-tools to build correctly. Install shiboken2 target files using install(EXPORT) to allow building PySide2 with an installed Shiboken2 package (as opposed to one that is built as part of the super project). Same with PySide2 targets for pyside2-tools subproject. Make sure not to redefine uninstall targets if they are already defined. Add a --shorter-paths setup.py option, which would be used by the Windows CI, to circumvent creating paths that are too long, and thus avoiding build issues. Output the build characteristics / classifiers into the generated build_history/YYYY-MM-DD_AAAAAA/build_dir.txt file, so it can be used by the test runner to properly filter out blacklisted tests. This was necessary due to the shorter paths options. Fix various issues regarding target includes and library dependencies. Remove certain duplicated cmake code (like limited api check and build type checks) in PySide2, given that that information will now be present in the exported shiboken2 config file. Include a short README.cmake.md file that describes how to build the super project. References used https://rix0r.nl/blog/2015/08/13/cmake-guide/ https://pabloariasal.github.io/2018/02/19/its-time-to-do-cmake-right/ https://gist.github.com/mbinna/c61dbb39bca0e4fb7d1f73b0d66a4fd1 https://cliutils.gitlab.io/modern-cmake/chapters/basics/functions.html https://cmake.org/cmake/help/v3.0/manual/cmake-packages.7.html https://github.com/ComicSansMS/libstratcom/blob/master/CMakeLists.txt Abandoned approach using ExternalProject references: https://cmake.org/cmake/help/latest/module/ExternalProject.html https://stackoverflow.com/questions/44990964/how-to-perform-cmakefind-package-at-build-stage-only Fixes: PYSIDE-919 Change-Id: Iaa15d20b279a04c5e16ce2795d03f912bc44a389 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Update pyside2-tools submoduleAlexandru Croitor2018-12-071-0/+0
| | | | | | Change-Id: I1aa12897a02ac70fb65a72160578732fdb179092 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Update pyside2-tools submodule SHA1Friedemann Kleint2018-11-261-0/+0
| | | | | | | Includes latest change regarding ninja. Change-Id: I6169533c8019601031a5140d2a9f2387ff6bbebf Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Update the pyside2-tools submodule sha1Alexandru Croitor2018-10-191-0/+0
| | | | | | | | | This includes the latest pyside_tool changes Change-Id: I6daed548a3bf0c73a880e9b7115f84ae967668d0 Fixes: PYSIDE-837 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update pyside2-tools submodule SHA1Alexandru Croitor2018-06-071-0/+0
| | | | | | | Includes latest changes regarding attribution. Change-Id: If4e7a21fde6bb2941cdfaae4f6fb1a7d91a64c8f Reviewed-by: Simo Fält <simo.falt@qt.io>
* Update pyside2-tools submoduleCristian Maureira-Fredes2018-06-011-0/+0
| | | | | Change-Id: I15f0f823b4fe45f544c0800e1bd3f205ccf7efaf Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* libshiboken: Add Array convertersFriedemann Kleint2017-08-031-0/+0
| | | | | | | | | | | | | | | | Add a SbkArrayConverter struct which provides a list of check functions that return a converter function for an array of matching size. Add simple array converters for arrays of C++ primitive types. Instances of the ArrayHandle<>, Array2Handle<> templates will be generated which may point to internal data or allocated arrays. Task-number: PYSIDE-354 Task-number: PYSIDE-516 Change-Id: I157606891fad345ccd7af6d4a9d4dcb0c634b2f4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update submodules for 5.9Friedemann Kleint2017-07-251-0/+0
| | | | | | Change-Id: I9e7c039d8fb75ecabb28bc2537a14bcfe88178f8 Reviewed-by: Simo Fält <simo.falt@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update the pyside-setup submodulesChristian Tismer2016-12-121-0/+0
| | | | | | | | | | From time to time, submodules need to be updated. Actually, I would even like to update the master module after every submodule checkin, but this seems to be not easy to do all the time. Change-Id: I52f266c58086186df05ddcc85085f35e2e28ead7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add option to link with libc++ on older OSX versions.Alexandru Croitor2016-05-111-0/+0
| | | | | | | | | | | | | | Versions of OSX lower than 10.9 link libstdc++ by default. Also libstdc++ is linked when the osx minimum deployment target is lower than 10.9. The new option allows explicitly linking libc++ in the cases mentioned above. It is not enabled by default, because most libraries and executables on versions lower than 10.9 are compiled with libstdc++, and mixing standard library versions can lead to crashes. Change-Id: I7397d2bbce2cfceaeb848f25e0bbf1a24ac9bde8 Reviewed-by: Christian Tismer <tismer@stackless.com>
* fix the name pyside2uicChristian Tismer2016-04-191-0/+0
| | | | This was modified, but not corrected in setup.py
* change all scripts to respect the new PySide2 module name.Christian Tismer2015-09-211-0/+0
| | | | still, there seem to be errors....
* not-so-small fix to the huge change.Christian Tismer2015-09-211-0/+0
| | | | | | I just understood what is needed to define a package: The files PySide2Config(...).cmake are crucial, the project names have little to do with that.
* huge change on project layout.Christian Tismer2015-09-211-0/+0
| | | | | | | | | | | The intention is to have PySide2 and Shiboken2 as project names, to allow for co-existence of PySide and PySide2. This is the first version that builds with these settings on OS X: $ python3 setup.py build --debug --no-examples --ignore-git --qmake=/usr/local/Cellar/qt5/5.5.0/bin/qmake --jobs=9 This is not yet tested.
* add/extend README.md files and add pyside2.wiki.git as a sub-repo of ↵Christian Tismer2015-09-201-0/+0
| | | | pyside2-setup.
* fix the sub-repos structure after renamingChristian Tismer2015-09-191-0/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 17:40:28 +0000