Merge "Fix binding loop in Toolbuttonstyle"

This commit is contained in:
Marco Martin 2014-09-13 12:28:49 +02:00 committed by Gerrit Code Review
commit 72caf0b9f0

View File

@ -170,7 +170,7 @@ QtQuickControlStyle.ButtonStyle {
implicitWidth: {
if (control.text.length == 0) {
height;
implicitHeight;
} else {
Math.max(theme.mSize(theme.defaultFont).width*12, style.minimumWidth);
}