8 commits

Author	SHA1	Message	Date
Nicolas Werner	07e71e6eae	Fix crash with ScrollView	2021-01-17 04:05:02 +01:00
Nicolas Werner	14cb3bfe10	Don't use centerIn on popup on Qt < 5.12	2021-01-12 15:55:36 +01:00
Nicolas Werner	6090d00251	Revert "Update QtQuick versions to match Qt 5.10" ... This reverts commit 74e32dd96b.	2021-01-12 15:03:39 +01:00
Joseph Donofry	74e32dd96b	Update QtQuick versions to match Qt 5.10	2021-01-11 22:17:00 -05:00
Joseph Donofry	3ff8b3ad8c	Merge master and fix conflicts	2021-01-11 17:51:39 -05:00
trilene	2bd8a386e2	Color and icon button spacing fixes	2021-01-07 14:04:54 +01:00
trilene	2984d71971	Fix Qml control colors	2021-01-07 14:04:54 +01:00
trilene	87d2074c81	Add devices dialog to CallInviteBar	2021-01-07 14:04:54 +01:00