~thopiekar/pyside/+git/shiboken-thopiekar:dirty-merge-5.9

Last commit made on 2017-12-03
Get this branch:
git clone -b dirty-merge-5.9 https://git.launchpad.net/~thopiekar/pyside/+git/shiboken-thopiekar

Branch merges

Branch information

Name:
dirty-merge-5.9
Repository:
lp:~thopiekar/pyside/+git/shiboken-thopiekar

Recent commits

5abf129... by Thomas Karl Pietrowski

Forgot some files again.

Signed-off-by: Thomas Karl Pietrowski <email address hidden> (github: thopiekar)

13d3b02... by Thomas Karl Pietrowski

Yet another dirty merge.. but in shiboken..

Signed-off-by: Thomas Karl Pietrowski <email address hidden> (github: thopiekar)

8f3761d... by Alexandru Croitor <email address hidden>

Fix double inclusion of qsharedpointer_impl.h file

This is a workaround to allow building QSharedPointer bindings
with the clang parser.

In the previous parser the Q_QDOC define was set, and thus the
implementation header was never included. When clang is queried
to return the file which implements QSharedPointer, it will return
the innermost header file. Because the header doesn't have header
guards, the build will fail with redefinition errors.

Task-number: PYSIDE-454
Change-Id: I5628fe2bafe528e11076f344b18b463db90c5651
Reviewed-by: Friedemann Kleint <email address hidden>

ba47a26... by Friedemann Kleint

Merge remote-tracking branch 'origin/5.6' into 5.9

Change-Id: I87da005aa528af30856e077769463c3c7e1ca18b

47e3a99... by Friedemann Kleint

Add rejection by function return type and argument type

Extend TypeRejection accordingly.

Task-number: PYSIDE-516
Change-Id: Ibf97f3c16498b26e63f4bde5b0ae21acc3dd0c44
Reviewed-by: Alexandru Croitor <email address hidden>

f6bc1cb... by Friedemann Kleint

TypeRejection: Use QRegularExpression

Refactor TypeRejection to use one regular expression for
the class name and one for the various strings to be matched
depending on the match type enumeration instead of 4 fixed
string fields.

Task-number: PYSIDE-516
Change-Id: Ifb945e3be39fbedfd802c4d32de7de443cf53f49
Reviewed-by: Alexandru Croitor <email address hidden>

467095a... by Friedemann Kleint

Improve rejection messages

In AbstractMetaBuilderPrivate::traverseFunction(), store the
unmodified signature with return type before resolving typedefs for
the messages. Extend the error messages about parameters and output
them to qWarning() and rejection logs consistently.

So:

Unmatched argument type
 - QOpenGLExtraFunctions::glIsSync(GLsync) -> GLboolean

becomes:

Unmatched argument type
 - GLboolean QOpenGLExtraFunctions::glIsSync(GLsync): unmatched type 'GLsync' in parameter #1 "sync"

Task-number: PYSIDE-516
Change-Id: Ifd680af1cd6d403d9b73ba3e40d06abe274cf359
Reviewed-by: Alexandru Croitor <email address hidden>

35d5adf... by Friedemann Kleint

Improve Clang detection

Check LLVM_INSTALL_DIR, CLANG_INSTALL_DIR and llvm-config
and make messages more verbose.

Task-number: PYSIDE-323
Change-Id: Iaff24d7c80853f381d227ebdccbb3abc4497a199
Reviewed-by: Christian Tismer <email address hidden>

51cb930... by Friedemann Kleint

Generate #error when a minimal constructor could not be found

The occurred in 3 places, one of which generated #error and the
others used qFatal(). Change it to always generate #error with
a bit of context to make it possible to detect the source of
of the problem.

Change-Id: Icd93b1beec908b57fa72457d6ec1e16a15e5ff14
Reviewed-by: Christian Tismer <email address hidden>

0b83c85... by Friedemann Kleint

Merge remote-tracking branch 'origin/5.6' into 5.9

Change-Id: I609232c2b63a01c83ca8e3abe4d6c3d191d397b2