git.iko.soy/unity8
on xenial help sign in
Try to make the vivid qt happy
2bd5238Albert Astals Cid
qml/Dash/Previews/PreviewTable.qml+1−1
compare with xenial
unifiedsplit
@@ -77,7 +77,7 @@ PreviewWidget {
77 font.weight: index == 0 ? Font.Normal : Font.Light
77 font.weight: index == 0 ? Font.Normal : Font.Light
78 wrapMode: Text.Wrap
78 wrapMode: Text.Wrap
79 Layout.alignment: Qt.AlignTop
79 Layout.alignment: Qt.AlignTop
80− Layout.minimumHeight: units.gu(2.75)
80+ Layout.minimumHeight: Math.max(units.gu(2.75), contentHeight) // FIXME Reevaluate if we need this once we move away from Qt 5.4
81 Layout.maximumWidth: index == 0 ? column.width / 4 : column.width - x
81 Layout.maximumWidth: index == 0 ? column.width / 4 : column.width - x
82 Layout.minimumWidth: index == 0 ? column.width / 4 : -1
82 Layout.minimumWidth: index == 0 ? column.width / 4 : -1
83 height: -1 // FIXME Qt 5.4 needs this otherwise wrapped columns
83 height: -1 // FIXME Qt 5.4 needs this otherwise wrapped columns
tests/qmltests/Dash/Previews/tst_PreviewTable.qml+1−1
@@ -83,7 +83,7 @@ Rectangle {
83 function test_label_heights() {
83 function test_label_heights() {
84 verify(findChild(previewTable, "label00").height == findChild(previewTable, "label10").height);
84 verify(findChild(previewTable, "label00").height == findChild(previewTable, "label10").height);
85 verify(findChild(previewTable, "label01").height == findChild(previewTable, "label11").height);
85 verify(findChild(previewTable, "label01").height == findChild(previewTable, "label11").height);
86− verify(findChild(previewTable, "label01").implicitHeight > findChild(previewTable, "label00").implicitHeight * 3);
86+ verify(findChild(previewTable, "label01").contentHeight > findChild(previewTable, "label00").contentHeight * 3);
87 verify(findChild(previewTable, "label00").height == findChild(previewTable, "label20").height);
87 verify(findChild(previewTable, "label00").height == findChild(previewTable, "label20").height);
88 verify(findChild(previewTable, "label20").height == findChild(previewTable, "label21").height);
88 verify(findChild(previewTable, "label20").height == findChild(previewTable, "label21").height);
89 }
89 }