aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Arve Sæther <jan-arve.saether@theqtcompany.com>2016-02-26 13:21:12 +0100
committerJan Arve Sæther <jan-arve.saether@theqtcompany.com>2016-03-01 23:31:49 +0000
commitb2ea9e760e867a8d5c7eb2bc6f4ad214bf23d9d4 (patch)
treedd0d3a61397633eedb49b8b8b65baa2989a4c2a6
parenta3144972af99a788f19fa84cba9d76948ae046b1 (diff)
Change test because of slight behavior change in the layout engine
The test was assuming that pixel snapping did not change the minimum size hint of the layout. An upcoming patch to qtbase will change that. Change-Id: I53bed57d086aa9ba9972188b014140c95d7669b9 Task-number: QTBUG-41216 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
-rw-r--r--tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml b/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml
index 1e7575481a..64a54830f9 100644
--- a/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml
+++ b/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml
@@ -700,7 +700,7 @@ Item {
{ tag: "abovePreferred", spacing: 0, width: 150, hints: [{pref: 50}, {pref: 20}, {pref: 70}]},
{ tag: "stretchSomethingToMaximum", spacing: 0, width: 240, hints: [{pref: 50}, {pref: 20}, {pref: 70}],
expected: [90, 60, 90] },
- { tag: "minSizeHasFractions", spacing: 2, width: 31 + 4, hints: [{min: 10+1/3}, {min: 10+1/3}, {min: 10+1/3}],
+ { tag: "minSizeHasFractions", spacing: 2, width: 33 + 4, hints: [{min: 10+1/3}, {min: 10+1/3}, {min: 10+1/3}],
/*expected: [11, 11, 11]*/ }, /* verify that nothing gets allocated a size smaller than its minimum */
{ tag: "maxSizeHasFractions", spacing: 2, width: 271 + 4, hints: [{max: 90+1/3}, {max: 90+1/3}, {max: 90+1/3}],
/*expected: [90, 90, 90]*/ }, /* verify that nothing gets allocated a size larger than its maximum */