~thopiekar/pyside/+git/pyside-tools:5.11.0

Last commit made on 2018-06-01
Get this branch:
git clone -b 5.11.0 https://git.launchpad.net/~thopiekar/pyside/+git/pyside-tools

Branch merges

Branch information

Name:
5.11.0
Repository:
lp:~thopiekar/pyside/+git/pyside-tools

Recent commits

f1b7755... by Friedemann Kleint

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

Change-Id: Ifbeca4189d55b7b925a0ac501f462ca0be6eb61f

b32eedc... by Cristian Maureira-Fredes <email address hidden>

qt_attribution file for pyside-tools

The rcc and lupdate directories have GPL-2.0 as license,
but since the Copyright headers differ
there are separate entries per tool.
uic has a double license BSD-3-clause and GPL-2.0,
so it also has a different entry.

Change-Id: Icee59de64dd41c1e49b2b2fd2216ef3ac5d87148
Reviewed-by: Friedemann Kleint <email address hidden>
Reviewed-by: Kai Koehne <email address hidden>
Reviewed-by: Alexandru Croitor <email address hidden>

844430a... by Cristian Maureira-Fredes <email address hidden>

Add verification for buttonGroup

Check if the buttonGroup attribute is already a string
instead of trying to extract it.

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

ac29394... by Friedemann Kleint

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

Change-Id: I4b27e6c35b6411235e2f1faa0de8decbcf9a5fde

de06c50... by Friedemann Kleint

pyside2-uic: Mention form license in header

Change-Id: Ib938f94e50b4f0843babd87f0a27ed60a412fcf5
Reviewed-by: Christian Tismer <email address hidden>
Reviewed-by: Alex Blasche <email address hidden>

ad85c74... by Julien Schueller

Do not install man pages on windows

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

5291486... by Julien Schueller

Make pyside2-uic executable by windows shell

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

d82e9de... by Julien Schueller

pyside2-rcc -help to return 0

This fixes pyside2-rcc -help to exit with return code 0
instead of 1 when there are no errors.
Also fixes the return code of pyside2-rcc -version.

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

413ecc7... by Alexandru Croitor <email address hidden>

Bump minimum required CMake version to 3.1.0

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

f68388c... by stackless

fix bogus setMargin in pyside2-uic

This bug has been reported five years ago.

By inspecting uiparser.py, in function createLayout, an extra 'margin' element is
added (~line 399) because the layout is child of a QWidget which is not the child
of the main window. The code in that function checks if there are individual
margin elements but fails in the case where there is a single 'margin' element,
that is, when all margins are equal. If at least one margin is different then the
problem doesn't appear.

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