Merge branch 'master' into qt5.5-compat
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Thu, 7 Nov 2019 14:49:43 +0000 (15:49 +0100)
committerGitHub <noreply@github.com>
Thu, 7 Nov 2019 14:49:43 +0000 (15:49 +0100)
commit0c6279f86a499af350be0e650417b947ef7c8eda
tree058fe2430bcc07f948254c8c86bb46d9413258b1
parenta143b42c2a11acec464a6232423623de0ab5ad8f
parent1cffa3b731917f6c042e7f356ae8d7cc11955ce4
Merge branch 'master' into qt5.5-compat