~thopiekar/pyside/+git/pyside-thopiekar:dev

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

Branch merges

Branch information

Recent commits

d4112e4... by Friedemann Kleint

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

Change-Id: I8eeca2bbbf6662d0bdc9c3ef5f4018d9f4019159

3f45ae1... by Friedemann Kleint

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

Change-Id: Ida4053330f436fa707689707d8a35734a836cd57

31c5a40... by Friedemann Kleint

Add flags for TouchPointState

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

b9e8c5f... by Friedemann Kleint

Adapt suppression pattern for parameter type warning to new format

Change-Id: Ibfe645aea0bdc9843bbc1e13cdabb04d2feb32e3
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>

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

Remove qmacstyle_mac.h and duplicate includes in global.h.in file

qmacstyle_mac.h sneaked in through a 5.6 -> 5.9 merge, which broke
builds on macOS. Remove the include, as well as remove other
duplicate includes which are now handled by the cmake global.h.in
append mechanism.

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

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

Fix PySide build using Qt frameworks

Change-Id: I37cae548c2ae451fa8672c9a54a19e929a831f25
Reviewed-by: Friedemann Kleint <email address hidden>
Reviewed-by: Christian Tismer <email address hidden>

352a804... by Friedemann Kleint

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

Change-Id: I5d7b278fab717c99a74d990d5b426120ee9c0c06

25bc996... by Friedemann Kleint

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

Change-Id: Id1c6fa0d1f05ba3e1bbe361a7e0bb20cd52a0a34

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>