~thopiekar/pyside/+git/pyside:5.6

Last commit made on 2017-05-19
Get this branch:
git clone -b 5.6 https://git.launchpad.net/~thopiekar/pyside/+git/pyside

Branch merges

Branch information

Name:
5.6
Repository:
lp:~thopiekar/pyside/+git/pyside

Recent commits

315a9ce... by Alexandru Croitor <email address hidden>

Fix build error when QML module is not present

The QML private API variable should be defined even when no QML module
was found, because it is used for substitutions in
signalmanager.cpp.in.

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

bc8b02c... by Alexandru Croitor <email address hidden>

Add QSharedPointer<QQuickItemGrabResult> to the type system

Also add test to check that calling QQuickItem::grabToImage() works
correctly.

The QSharedPointer type is added in the QtQuick typesystem file
and not in QtCore to minimize the surface of issues that might come up,
as well as because that's the only reasonable use case of QSharedPointer
in the public API so far.

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

8465adf... by Alexandru Croitor <email address hidden>

Collect Qt packages earlier to support QML exceptions

When a80a6eb94433529a6d984e8ff22874f7dff48eea was introduced,
collection of Qt packages was moved from the top level CMake project,
to the PySide2 CMake subproject. This caused the issue that libpyside
could not find the QML private API classes (due to the packages not
being found in the project scope), leading to the failing test
javascript_exceptions.py.

This change moves the collection of the Qt packages back into the
top-level project, so that the found Qt packages are propagated to
all subprojects, including libpyside.

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

5e507c6... by Alexandru Croitor <email address hidden>

Properly differentiate between QML support and private API QML support

This change introduces proper differentiation between finding the QML
headers, and finding the QML private API headers. The public headers
are used for proper QQuickItem subclass registration, while the
the private headers are used for converting QML exceptions to Python
exceptions.

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

2abd423... by Alexandru Croitor <email address hidden>

Warn when QML private API include files could not be found

Change-Id: Ie52eb933239a81b2f6563d5f12c1b0bdb0156877
Reviewed-by: Friedemann Kleint <email address hidden>

31c5a40... by Friedemann Kleint

Add flags for TouchPointState

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

028a3cb... by Liang Qi <email address hidden>

Add QMacPasteboardMime and qRegisterDraggedTypes() to typesystem

Task-number: PYSIDE-487
Change-Id: I56b9138e8b368754ee07965479d6c8e795fc8206
Reviewed-by: Christian Tismer <email address hidden>
Reviewed-by: Friedemann Kleint <email address hidden>

a80a6eb... by stackless

Rewrite CMake scripts and generate includes for global.h.in

The CMake files are repeating code three times, which should be avoided.
Also, the global.h.in contained too many unconditional includes, which becomes
relevant for the PySide 5.9 branch when missing includes are no longer ignored.
Instead of maintaining an always growing list of conditionals (did that first),
the needed includes are now computed by CMake, and the collected
includes are appended to pyside2_global.h .

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

98b6c69... by stackless

Remove fixup_headers after fixing shiboken for C++11

The hack for VS 2015 is replaced by a shiboken patch.
This must be immediately applied after shiboken was fixed.

Reason: The build would work, but Windows will not load
because of missing symbols!

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

81f9209... by Friedemann Kleint

QtGui/QRawFont: Exclude member functions with array parameters

Fix warnings:

qt.shiboken: There's no user provided way (conversion rule, argument removal, custom code, etc) to handle the primitive argument type 'const quint32 *' in function 'QRawFont::advancesForGlyphIndexes(const quint32 * glyphIndexes, QPointF * advances, int numGlyphs) const'.
qt.shiboken: There's no user provided way (conversion rule, argument removal, custom code, etc) to handle the primitive argument type 'const QChar *' in function 'QRawFont::glyphIndexesForChars(const QChar * chars, int numChars, quint32 * glyphIndexes, int * numGlyphs) const'.
...

Amends 2e9f955a086fa7676c9eda60ca9e28cc03d9c5e2.

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