lp:~pyside/pyside/shiboken
- Get this branch:
- bzr branch lp:~pyside/pyside/shiboken
Branch merges
Import details
This branch is an import of the HEAD branch of the Git repository at git://gitorious.org/pyside/shiboken.git.
Last successful import was .
Recent revisions
- 1541. By Matthew Woehlke <email address hidden>
-
Process global enums in declaration order
In the same vein as the previous commit, process global enums in order
added (which presumably is declaration order). For what we're doing at
this point, this may not be as critical, but again is needed to avoid a
spurious test failure.Change-Id: If32a07fee2e7e9
b7699e01eda3408 ed57855e947
Reviewed-by: John Cummings <email address hidden> - 1540. By Matthew Woehlke <email address hidden>
-
Return enums in declaration order (order added)
Modify _ScopeModelItem to return enums (from the enums() method) in the
order that they were added (which presumably is the order in which they
were declared). We must do this because we must process enumerations in
the same order in order to resolve values, as later declared enums may
refer to values from earlier declared enums (and in fact, this is
exactly the case in the 'testenum' test), and the order we get just from
QHash may not match declaration order.Change-Id: I15a05df98a2cee
7ecccb6c82d3f90 17735281245
Reviewed-by: John Cummings <email address hidden> - 1539. By John Ehresman
-
Version bump
Change-Id: I4da6558dfa2dd2
aaae6343d2363b7 fcfc7786f45
Reviewed-by: John Cummings <email address hidden> - 1538. By John Cummings <email address hidden>
-
Remove rejection lines that cause the sample_list test to fail
These functions (except createComplexList) are are needed by the test.
Prior to 5b39f7fd9e21, the rejections were not being recognized; removing
them returns the wrappings to their previous state and allows the test to
pass again.Change-Id: I3efb08383b2d59
f9917a4e4a0200e 0516db9c83e
Reviewed-by: Matthew Woehlke <email address hidden>
Reviewed-by: John Ehresman <email address hidden> - 1537. By John Ehresman
-
Remove protected from samblebinding test
The protected sections triggered a generation bug when avoiding
the protected hackChange-Id: I6346cdb74a25f1
ddf49263d9f7467 0a3b105b07a
Reviewed-by: Matthew Woehlke <email address hidden>
Reviewed-by: Roman Lacko <email address hidden> - 1536. By Matthew Woehlke <email address hidden>
-
Add parsing of 'noexcept' keyword
Teach Shiboken to parse the 'noexcept' keyword. This doesn't add any
features (and we only support unconditional 'noexcept' for now), but
addresses an internal error that causes shiboken to SEGV trying to parse
modern versions of boost::intrusive_ ptr. A test case to replicate the
crash (without the other changes) is also added.Change-Id: I4713593dfd189c
02ef4a2d7447d78 5b6d378019c
Reviewed-by: John Ehresman <email address hidden> - 1535. By Matthew Woehlke <email address hidden>
-
Fix function rejections (i.e. support overloads)
Add an additional check to AbstractMetaBui
lder::traverseF unction to also
perform a quick-and-dirty construction of the function signature, and to
check that against the rejections. Add a unit test for matching full
signatures.Before, we were only testing the function name; as a result, a rejection
like 'foo()' would never match (because the name does not have ()'s).
This is especially helpful for rejecting specific overloads of functions
while allowing others to be wrapped normally. (The unit test shows a
not-so-far-fetched example why one might want to do this.)The signature building logic isn't very sophisticated and likely
requires a very exacting match to the signature as it appears in the
wrapped sources, but that's likely not a serious issue, and at any rate
this is much better than not being able to match overloads at all.Change-Id: Ic686377477aacf
54f79c7bd2013e9 aea8521a4ea
Reviewed-by: John Ehresman <email address hidden> - 1534. By WhyNotHugo
-
Fix building with python 3.3 and 3.4.
FindPython3Libs
.cmake lists hardcoded versions of python3 to look for,
which include up to python 3.2.Added python 3.3 and 3.4 to this list so that building on these versions
works.A better solution would be ideal in future, so as to avoid having to
add python versions to this list as time passes. However, this fixes
the issue for now.Change-Id: I9c113f70164c30
dc3a94a5c946fac bc38901f68e
Reviewed-by: John Ehresman <email address hidden> - 1533. By Raphael Kubo da Costa <email address hidden>
-
doc: Stop requiring sphinx.
ext.refcounting . Sphinx 1.2 made a backwards-
incompatible change and removed its
`refcounting' extension module because it "is very specific to CPython
and has no place in the main distribution".Fix the build with Sphinx 1.2+ by not requiring it in conf.py.in; we were
not using it before anyway (the `refcount_file' variable was not set) and it
was likely added by default when the configuration file was generated.Change-Id: I6c775fb4c1c2da
ae25aade68079ef c2e77225a0f
Reviewed-by: John Ehresman <email address hidden> - 1532. By Matthew Woehlke <email address hidden>
-
Fix for containers with 'const' values
Fix omission of 'const' specifier when generating binding code for
containers whose value type is 'const', which would lead to binding code
that does not compile due to 'const' mismatch. Includes test case.Change-Id: Iff99a16ee071bb
255f78e86e2456e 5206cc00cfb
Reviewed-by: John Cummings <email address hidden>
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)