diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-03-05 09:50:36 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-03-06 07:31:31 +0000 |
commit | 1cc7e20dc9cf8701d6054e89f35f580f3a28a1ab (patch) | |
tree | 5968ac3fc810bb0037b1b418df0b15cf5de9122a /recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch | |
parent | dc20529cd55600787c003f5db4c82352740c3cf6 (diff) | |
download | meta-boot2qt-1cc7e20dc9cf8701d6054e89f35f580f3a28a1ab.tar.gz |
meta-qt5: update meta layer
- Update submodules to first 5.9.5 branch snapshot
- mysql_config path fix
- Update Qt SRC_URI from github.com to code.qt.io
Adjust meta-boot2qt recipes accordingly due Qt
source mirror change.
Task-number: QTBUG-66252
Change-Id: Ide5542c7d3439fc4ce72e053bbbb63b1a36d7365
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch')
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch b/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch deleted file mode 100644 index 920273e..0000000 --- a/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 83046de497827a69bf05cd0b06ca6421b51e02b8 Mon Sep 17 00:00:00 2001 | ||
2 | From: J-P Nurmi <jpnurmi@qt.io> | ||
3 | Date: Mon, 22 Jan 2018 10:58:06 +0100 | ||
4 | Subject: [PATCH] Control: fix background size regression caused by deferred | ||
5 | execution | ||
6 | |||
7 | Task-number: QTBUG-65880 | ||
8 | Change-Id: Ic4f9fb087f4a78bd4c6257828011240186b6b22e | ||
9 | Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> | ||
10 | --- | ||
11 | src/quicktemplates2/qquickcontrol.cpp | 1 + | ||
12 | tests/auto/controls/data/tst_popup.qml | 8 ++++++++ | ||
13 | 2 files changed, 9 insertions(+) | ||
14 | |||
15 | diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp | ||
16 | index 6fbd4c07..957936df 100644 | ||
17 | --- a/src/quicktemplates2/qquickcontrol.cpp | ||
18 | +++ b/src/quicktemplates2/qquickcontrol.cpp | ||
19 | @@ -1343,6 +1343,7 @@ void QQuickControl::componentComplete() | ||
20 | d->executeBackground(true); | ||
21 | d->executeContentItem(true); | ||
22 | QQuickItem::componentComplete(); | ||
23 | + d->resizeBackground(); | ||
24 | d->resizeContent(); | ||
25 | if (!d->hasLocale) | ||
26 | d->locale = QQuickControlPrivate::calcLocale(d->parentItem); | ||
27 | diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml | ||
28 | index bec50ad0..1f3a097f 100644 | ||
29 | --- a/tests/auto/controls/data/tst_popup.qml | ||
30 | +++ b/tests/auto/controls/data/tst_popup.qml | ||
31 | @@ -1253,4 +1253,12 @@ TestCase { | ||
32 | control.open() | ||
33 | verify(control.visible) | ||
34 | } | ||
35 | + | ||
36 | + function test_deferredBackgroundSize() { | ||
37 | + var control = createTemporaryObject(popupControl, testCase, {width: 200, height: 100}) | ||
38 | + verify(control) | ||
39 | + | ||
40 | + compare(control.background.width, 200) | ||
41 | + compare(control.background.height, 100) | ||
42 | + } | ||
43 | } | ||