Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2020-03-14 13:13:40 +01:00
commit 961d2ee269
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
123 changed files with 2506 additions and 1195 deletions

View file

@ -2321,7 +2321,7 @@ full programmatic control over your models.")
("python-pyside-2-tools" ,python-pyside-2-tools)
("python-shiboken-2" ,python-shiboken-2)
("python-wrapper" ,python-wrapper)
("qtbase" ,qtbase-patched)
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
("qtx11extras" ,qtx11extras)
("qtxmlpatterns" ,qtxmlpatterns)