Merge remote-tracking branch 'upstream/3.0'

This commit is contained in:
Lipu Fei 2017-10-05 15:49:18 +02:00
commit 185c350a19
14 changed files with 322 additions and 289 deletions

View file

@ -15,7 +15,7 @@ UM.Dialog
minimumWidth: 500 * screenScaleFactor
minimumHeight: 400 * screenScaleFactor
width: minimumWidth
height: minumumHeight
height: minimumHeight
property int comboboxHeight: 15 * screenScaleFactor
property int spacerHeight: 10 * screenScaleFactor