aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* a quick fix that should work, but will become obsolete with Qt 5.6.1qt5-licenseChristian Tismer2016-04-191-0/+6
|
* Fixed shibokengenerator.cppzhihaoadsk2016-04-141-1/+1
| | | | | | | | | In shibokengenerator.cpp, guessScopeForDefaultValue() think that NULL is a member of QJsonParseError and prefix it with QJsonParseError::“NULL” should not be prefixed.. It’s caused by prefixing the qualified class name to NULL constant in qjsondocument_wrapper.cpp ::QJsonParseError* cppArg1 = QJsonParseError::NULL; [ 10%] Building CXX object PySide2/QtCore/CMakeFiles/QtCore.dir/PySide2/QtCore/q jsonarray_wrapper.cpp.obj qjsonarray_wrapper.cpp [ 10%] Building CXX object PySide2/QtCore/CMakeFiles/QtCore.dir/PySide2/QtCore/q jsondocument_wrapper.cpp.obj qjsondocument_wrapper.cpp D:\PySide2NewGit\pyside_build\py2.7-qt5.6.0-64bit-release\pyside2\PySide2\QtCore \PySide2\QtCore\qjsondocument_wrapper.cpp(346) : error C2589: 'constant' : illegal token on right side of '::' D:\PySide2NewGit\pyside_build\py2.7-qt5.6.0-64bit-release\pyside2\PySide2\QtCore \PySide2\QtCore\qjsondocument_wrapper.cpp(346) : error C2059: syntax error : '::'
* Ouch! It is called STATUS not INFOThomas Karl Pietrowski2016-04-021-1/+1
|
* Return value of PYTHON_EXTENSION_SUFFIX as INFOThomas Karl Pietrowski2016-04-021-1/+1
|
* Merge pull request #34 from f3nix/small-fixes-4Thomas Karl Pietrowski2016-04-021-1/+1
|\ | | | | Fix building of apiextractor target.
| * Fix building of apiextractor target.Mateusz Skowroński2016-02-291-1/+1
|/
* add missing includes to make the tests buildChristian Tismer2016-02-232-1/+3
|
* Merge pull request #32 from gbaty/remove_multiarch_suffix_if_not_availableThomas Karl Pietrowski2016-02-101-10/+10
|\ | | | | Do not add MULTIARCH suffix if not available.
| * Define release suffix depending on python version.Guillaume Bâty2016-02-091-10/+10
| | | | | | | | If multiarch is enabled, add suffix.
| * Remove check on version less than 3.5 in PYTHON_EXTENSION_SUFFIX defGuillaume Bâty2016-02-091-7/+3
| | | | | | | | | | This test is useless because PYTHON_MULTIARCH_SUFFIX can be defined for all py3.4 and py3.5 versions. The check of PYTHON_MULTIARCH_SUFFIX existence is sufficient to check if MULTIARCH support is enabled.
| * Do not add MULTIARCH suffix if not available.Guillaume Bâty2016-02-091-1/+5
|/ | | | | | On some python builds, "sysconfig.get_config_var('MULTIARCH')" returns an empty string. This case produce python extensions that are not recognized by python interpreter. This commit fix this issue.
* Merge pull request #30 from f3nix/small-fixes-2Christian Tismer2016-01-311-6/+6
|\ | | | | Fix GCC 5 warning: logical not is only applied to the left hand side …
| * Fix GCC 5 warning: logical not is only applied to the left hand side of ↵Mateusz Skowroński2016-01-281-6/+6
| | | | | | | | comparison [-Wlogical-not-parentheses]
* | Merge pull request #28 from gbaty/fix_libsampleThomas-Karl Pietrowski2016-01-311-1/+1
|\ \ | | | | | | Change include from "BlackBox.h" (do not exists) to "blackbox.h"
| * | Change include from "BlackBox.h" (do not exists) to "blackbox.h"Guillaume Bâty2016-01-231-1/+1
| |/
* | Merge pull request #31 from f3nix/small-fixes-3Christian Tismer2016-01-311-6/+6
|\ \ | |/ |/| Fix GCC 5 warning: logical not is only applied to the left hand side …
| * Fix GCC 5 warning: logical not is only applied to the left hand side of ↵Mateusz Skowroński2016-01-281-6/+6
|/ | | | comparison [-Wlogical-not-parentheses]
* Merge pull request #26 from thopiekar/cmake-workThomas-Karl Pietrowski2016-01-233-10/+10
|\ | | | | Just missed to rename some other PYTHON_SUFFIX to PYTHON_EXTENSION_SUFFIX
| * Just missed to rename some other PYTHON_SUFFIX to PYTHON_EXTENSION_SUFFIXThomas-Karl Pietrowski2016-01-223-10/+10
| |
* | Merge pull request #25 from thopiekar/cmake-workChristian Tismer2016-01-213-12/+61
|\| | | | | Bundle of fixes and additions to CMake
| * Bundle of fixes and additions to CMakeThomas-Karl Pietrowski2016-01-163-12/+61
|/ | | | | | | | * USE_PYTHON3 got renamed to USE_PYTHON_VERSION -> This variable can be now used to set a specific version to build for. For example, if you like to build for 3.4.5 you can set "-DUSE_PYTHON_VERSION=3.4". * Adding a block for debugging all PYTHON* variables. Useful for hunting bugs. * Adding generation of a extension suffix for Linux. Can also be useful for WIN and MAC, when building for different Python versions, so try it out. * Renamed PYTHON_SUFFIX into PYTHON_EXTENSION_SUFFIX (!). This might break others work! This variable name is more selfexplaining, that's why I renamed it.
* Merge pull request #23 from IronManMark20/masterChristian Tismer2015-12-281-1/+1
|\ | | | | Fix for deprecation of <unordered_map> in MSVC 14
| * Fix for deprecated bitEthan2015-12-191-1/+1
| |
* | Merge pull request #22 from florindinu/generator-metatype-parserChristian Tismer2015-12-287-4/+76
|\ \ | | | | | | Fix the metatype parser handling of pointer template parameters
| * | Simple test for the template pointer parameter fix.Florin Dinu2015-12-116-0/+71
| | |
| * | Fix the metatype parser handling of pointer template parameters and pointer ↵Florin Dinu2015-12-101-4/+5
| |/ | | | | | | references.
* | Merge pull request #20 from dbrnz/pythondirChristian Tismer2015-12-281-1/+1
|\ \ | | | | | | Use Python's site-packages directory
| * | Use Python's `site-packages` directory, not the one in the ↵David Brooks2015-12-051-1/+1
| |/ | | | | | | CMAKE_INSTALL_PREFIX directory.
* | Merge pull request #17 from dbrnz/symlinkdirChristian Tismer2015-12-281-10/+3
|\ \ | | | | | | The include file handler wasn't rejecting all directory targets
| * | The include file handler wasn't rejecting targets that resolve to ↵David Brooks2015-12-041-10/+3
| |/ | | | | | | directories via links.
* | Merge branch 'florindinu-visual-studio-build'Christian Tismer2015-12-281-0/+3
|\ \ | | | | | | | | | | | | * florindinu-visual-studio-build: add a comment why in this case using cmake's sorcery is superior than explicit paths
| * | add a comment why in this case using cmake's sorcery is superior than ↵Christian Tismer2015-12-281-0/+3
| | | | | | | | | | | | explicit paths
| * | Merge branch 'visual-studio-build' of ↵Christian Tismer2015-12-281-1/+1
| |\ \ | | | | | | | | | | | | https://github.com/florindinu/shiboken2 into florindinu-visual-studio-build
* | \ \ Merge pull request #11 from florindinu/visual-studio-buildChristian Tismer2015-12-281-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / Fix running the shiboken generator during build on Visual Studio
| * | Fix running the generator during build on Visual Studio.Florin Dinu2015-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | On Windows, when using Visual Studio, there is an additional "Debug" or "Release" directory under the `<project_name>`_BINARY_DIR path so running the generator would sometimes fail. In later versions of CMake, we can pass the executable target's name directly to `add_custom_command` and it will use the correct path.
* | | Merge pull request #19 from dbrnz/shiboken2_soChristian Tismer2015-12-277-7/+7
|\ \ \ | |_|/ |/| | Name of shiboken Python package is inconsistent.
| * | The shiboken module is called `shiboken2` but the typesystem and tests refer ↵David Brooks2015-12-057-7/+7
|/ / | | | | | | to it as `shiboken`.
* | Merge branch 'python3_unix_fix'Christian Tismer2015-12-025-335/+8
|\ \ | | | | | | | | | | | | * python3_unix_fix: fixing the python3 build on unixen.
| * | fixing the python3 build on unixen.Christian Tismer2015-12-025-335/+8
| |/ | | | | | | | | | | | | | | | | Actually, this worked mostly by removing the python3 special modules. After that, things started to build. It has to be checked, if this works on windows and OS X as well. Also, there is a build error on Debian and qt 5.3.X at the moment. But at least, it works better than before.
* | Merge pull request #13 from florindinu/build-improvementsChristian Tismer2015-12-021-1/+1
|\ \ | |/ |/| Improve CMake FindPythonLibs reliability
| * Improve CMake FindPythonLibs reliabilityFlorin Dinu2015-11-251-1/+1
|/ | | | | If we find the Python interpreter first, FindPythonLibs will take advantage of the interpreter's location. This will improve reliability on systems that have multiple Python versions installed.
* fixing debug builds on windows.Christian Tismer2015-11-121-0/+3
| | | | | How on earth did people debug without debug builds? This must have been wrong before the move to Qt5.
* Merge branch 'new_metaobject'Christian Tismer2015-11-0712-11/+10
|\ | | | | | | | | | | * new_metaobject: fixing the shiboken tests (renaming effects) remove metaObject method (done when parsing sources with Q_DOC macro)
| * fixing the shiboken tests (renaming effects)Christian Tismer2015-11-0715-16/+16
| |
| * remove metaObject method (done when parsing sources with Q_DOC macro)jumaroch2015-11-041-1/+0
| |
* | fix broken shiboken tests after the big renamingChristian Tismer2015-10-213-6/+6
|/
* Merge pull request #9 from thopiekar/cmake-workChristian Tismer2015-09-281-0/+2
|\ | | | | Fix for empty PYTHON*_VERSION_* variables
| * Fix for empty PYTHON3_VERSION_* variablesThomas-Karl Pietrowski2015-09-281-0/+2
| |
* | Merge pull request #8 from thopiekar/cmake-workChristian Tismer2015-09-281-3/+3
|\| | | | | Quick fix for last PR.
| * Quick fix for last PR.Thomas-Karl Pietrowski2015-09-281-3/+3
| | | | | | | | Sorry, for being too lazy to testing this.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 21:30:15 +0000