~thopiekar/pyside/+git/shiboken:qt5-license

Last commit made on 2016-04-19
Get this branch:
git clone -b qt5-license https://git.launchpad.net/~thopiekar/pyside/+git/shiboken

Branch merges

Branch information

Name:
qt5-license
Repository:
lp:~thopiekar/pyside/+git/shiboken

Recent commits

9b4a3cf... by Christian Tismer <email address hidden>

a quick fix that should work, but will become obsolete with Qt 5.6.1

6064ead... by zhihaoadsk <email address hidden>

Fixed shibokengenerator.cpp
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 : '::'

6a28b3e... by Thomas Karl Pietrowski

Ouch! It is called STATUS not INFO

d597c04... by Thomas Karl Pietrowski

Return value of PYTHON_EXTENSION_SUFFIX as INFO

1333f7e... by Thomas Karl Pietrowski

Merge pull request #34 from f3nix/small-fixes-4

Fix building of apiextractor target.

1158c9c... by Mateusz Skowroński

Fix building of apiextractor target.

32d5805... by stackless

add missing includes to make the tests build

dc85f37... by Thomas Karl Pietrowski

Merge pull request #32 from gbaty/remove_multiarch_suffix_if_not_available

Do not add MULTIARCH suffix if not available.

efea605... by =?utf-8?q?Guillaume_B=C3=A2ty?= <email address hidden>

Define release suffix depending on python version.
If multiarch is enabled, add suffix.

3cf2a97... by =?utf-8?q?Guillaume_B=C3=A2ty?= <email address hidden>

Remove check on version less than 3.5 in PYTHON_EXTENSION_SUFFIX def
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.