Skip to content
Snippets Groups Projects
Commit bfa83d77 authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'master' into 'develop'

Master

See merge request !33
parents 7b447f24 77cb2829
No related branches found
No related tags found
1 merge request!33Master
...@@ -85,7 +85,6 @@ ComboBox ...@@ -85,7 +85,6 @@ ComboBox
//@detalis mainLineText Text without unneccesary part. //@detalis mainLineText Text without unneccesary part.
property string mainLineText property string mainLineText
width: popup.visible ? widthPopupComboBoxActive : widthPopupComboBoxNormal width: popup.visible ? widthPopupComboBoxActive : widthPopupComboBoxNormal
height: popup.visible ? heightComboBoxActive : heightComboBoxNormal height: popup.visible ? heightComboBoxActive : heightComboBoxNormal
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment