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

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

7d9f363... by Thomas Karl Pietrowski on 2017-12-02

Adding new files from pyside-setup

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

f3b97e0... by Thomas Karl Pietrowski on 2017-12-02

Merging all work from pyside-setup

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

d4112e4... by Friedemann Kleint on 2017-05-18

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

Change-Id: I8eeca2bbbf6662d0bdc9c3ef5f4018d9f4019159

3f45ae1... by Friedemann Kleint on 2017-05-18

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

Change-Id: Ida4053330f436fa707689707d8a35734a836cd57

31c5a40... by Friedemann Kleint on 2017-05-16

Add flags for TouchPointState

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

b9e8c5f... by Friedemann Kleint on 2017-05-16

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> on 2017-05-09

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> on 2017-05-09

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> on 2017-04-28

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 on 2017-05-09

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

Change-Id: I5d7b278fab717c99a74d990d5b426120ee9c0c06