2bd5238 · unity8 · git.iko.soy

git.iko.soy/unity8

Try to make the vivid qt happy

commit2bd523803806bdaf85945c332c204e7718483381 authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 18 Oct 2016, 15:08 (10 years ago) parent01e3fdd

2 files changed+2−2

compare with xenial

unifiedsplit

qml/Dash/Previews/PreviewTable.qml+1−1 tests/qmltests/Dash/Previews/tst_PreviewTable.qml+1−1

qml/Dash/Previews/PreviewTable.qml+1−1

@@ -77,7 +77,7 @@ PreviewWidget {

7777 font.weight: index == 0 ? Font.Normal : Font.Light

7878 wrapMode: Text.Wrap

7979 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

8181 Layout.maximumWidth: index == 0 ? column.width / 4 : column.width - x

8282 Layout.minimumWidth: index == 0 ? column.width / 4 : -1

8383 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 {

8383 function test_label_heights() {

8484 verify(findChild(previewTable, "label00").height == findChild(previewTable, "label10").height);

8585 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);

8787 verify(findChild(previewTable, "label00").height == findChild(previewTable, "label20").height);

8888 verify(findChild(previewTable, "label20").height == findChild(previewTable, "label21").height);

8989 }