summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-qt/automotive/multiscreen-demo_git.bb2
-rw-r--r--recipes-qt/automotive/neptune-ui_git.bb2
-rw-r--r--recipes-qt/automotive/qmllive-target_git.bb6
-rw-r--r--recipes-qt/automotive/qtwebbrowser_git.bb5
-rw-r--r--recipes-qt/b2qt-addons/b2qt-demos.bb14
-rw-r--r--recipes-qt/b2qt-addons/b2qt-launcher.bb6
-rw-r--r--recipes-qt/b2qt-addons/democompositor_git.bb6
-rw-r--r--recipes-qt/b2qt-addons/qdbd.bb8
-rw-r--r--recipes-qt/qt5/qtotaupdate.bb3
-rw-r--r--recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch43
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bbappend34
-rw-r--r--scripts/manifest.xml2
12 files changed, 26 insertions, 105 deletions
diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb
index 51369cf..c81adee 100644
--- a/recipes-qt/automotive/multiscreen-demo_git.bb
+++ b/recipes-qt/automotive/multiscreen-demo_git.bb
@@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c
34inherit qt5-module systemd 34inherit qt5-module systemd
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37QT_GIT = "git://code.qt.io/qt-apps" 37QT_GIT_PROJECT = "qt-apps"
38QT_MODULE_BRANCH = "master" 38QT_MODULE_BRANCH = "master"
39 39
40SRC_URI += "\ 40SRC_URI += "\
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index d656aef..5fc3965 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -35,7 +35,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=c41b4a3e669de55dfe304b8376b04a82"
35inherit qt5-module systemd 35inherit qt5-module systemd
36require recipes-qt/qt5/qt5-git.inc 36require recipes-qt/qt5/qt5-git.inc
37 37
38QT_GIT = "git://code.qt.io/qt-apps" 38QT_GIT_PROJECT = "qt-apps"
39 39
40SRC_URI += " \ 40SRC_URI += " \
41 file://neptune.service \ 41 file://neptune.service \
diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/recipes-qt/automotive/qmllive-target_git.bb
index 4bf7ef8..54f1188 100644
--- a/recipes-qt/automotive/qmllive-target_git.bb
+++ b/recipes-qt/automotive/qmllive-target_git.bb
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -35,8 +35,8 @@ LIC_FILES_CHKSUM = "file://../../LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f
35inherit qmake5 35inherit qmake5
36require recipes-qt/qt5/qt5-git.inc 36require recipes-qt/qt5/qt5-git.inc
37 37
38QT_GIT = "git://github.com/qtproject" 38QT_GIT_PROJECT = "qt-apps"
39QT_MODULE = "qt-apps-qmllive" 39QT_MODULE = "qmllive"
40QT_MODULE_BRANCH = "master" 40QT_MODULE_BRANCH = "master"
41 41
42SRC_URI += " \ 42SRC_URI += " \
diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb
index 25e28df..9cc0d37 100644
--- a/recipes-qt/automotive/qtwebbrowser_git.bb
+++ b/recipes-qt/automotive/qtwebbrowser_git.bb
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -34,8 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6"
34inherit qmake5 34inherit qmake5
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37QT_GIT = "git://github.com/qtproject" 37QT_GIT_PROJECT = "qt-apps"
38QT_MODULE = "qt-apps-qtwebbrowser"
39QT_MODULE_BRANCH = "dev" 38QT_MODULE_BRANCH = "dev"
40 39
41SRCREV = "023733af5523a5ad84359926224fa106001215f4" 40SRCREV = "023733af5523a5ad84359926224fa106001215f4"
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index f133352..b816a11 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -33,18 +33,18 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4
33 33
34inherit qmake5 34inherit qmake5
35 35
36QT_PROJECT_GIT = "git://github.com/qtproject" 36QT_GIT_PROJECT = ""
37 37
38SRC_URI = " \ 38SRC_URI = " \
39 ${QT_PROJECT_GIT}/qt-apps-boot2qt-demos.git;branch=${BRANCH};name=demos \ 39 ${QT_GIT}qt-apps/boot2qt-demos.git;branch=${BRANCH};name=demos \
40 ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ 40 ${QT_GIT}qt/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \
41 ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ 41 ${QT_GIT}qt/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \
42 ${QT_PROJECT_GIT}/qt-apps-qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ 42 ${QT_GIT}qt-apps/qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
43 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \ 43 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \
44 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ 44 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
45 " 45 "
46 46
47PV = "5.7+git${SRCPV}" 47PV = "5.9.5+git${SRCPV}"
48 48
49BRANCH = "5.7" 49BRANCH = "5.7"
50BROWSER_BRANCH = "dev" 50BROWSER_BRANCH = "dev"
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index 32f569b..0a0a21f 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -34,8 +34,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
34inherit qmake5 34inherit qmake5
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37QT_GIT = "git://github.com/qtproject" 37QT_GIT_PROJECT = "qt-apps"
38QT_MODULE = "qt-apps-boot2qt-launcher" 38QT_MODULE = "boot2qt-launcher"
39 39
40SRC_URI += " \ 40SRC_URI += " \
41 file://b2qt-startup.sh \ 41 file://b2qt-startup.sh \
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb
index 8834e19..3d9a196 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/recipes-qt/b2qt-addons/democompositor_git.bb
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -34,8 +34,8 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginli
34inherit qmake5 34inherit qmake5
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37QT_GIT = "git://github.com/qtproject" 37QT_GIT_PROJECT = "qt-apps"
38QT_MODULE = "qt-apps-boot2qt-demos" 38QT_MODULE = "boot2qt-demos"
39 39
40SRCREV = "b9585b440819e1444b20f30435f81c46801158c5" 40SRCREV = "b9585b440819e1444b20f30435f81c46801158c5"
41 41
diff --git a/recipes-qt/b2qt-addons/qdbd.bb b/recipes-qt/b2qt-addons/qdbd.bb
index 3a9a002..c98e682 100644
--- a/recipes-qt/b2qt-addons/qdbd.bb
+++ b/recipes-qt/b2qt-addons/qdbd.bb
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -36,9 +36,9 @@ inherit distro_features_check
36inherit qmake5 36inherit qmake5
37require recipes-qt/qt5/qt5-git.inc 37require recipes-qt/qt5/qt5-git.inc
38 38
39QT_GIT = "git://github.com/qtproject" 39QT_GIT_PROJECT = "qt-apps"
40QT_MODULE = "qt-apps-qdb" 40QT_MODULE = "qdb"
41QT_MODULE_BRANCH = "5.8" 41QT_MODULE_BRANCH = "5.9"
42 42
43SRC_URI += "file://b2qt-gadget-network.sh \ 43SRC_URI += "file://b2qt-gadget-network.sh \
44 file://defaults \ 44 file://defaults \
diff --git a/recipes-qt/qt5/qtotaupdate.bb b/recipes-qt/qt5/qtotaupdate.bb
index ee7623c..495598a 100644
--- a/recipes-qt/qt5/qtotaupdate.bb
+++ b/recipes-qt/qt5/qtotaupdate.bb
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -34,7 +34,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
34inherit qt5-module 34inherit qt5-module
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37QT_GIT = "git://github.com/qt"
38QT_MODULE_BRANCH = "master" 37QT_MODULE_BRANCH = "master"
39 38
40SRCREV = "9a7eef1fec80e732451d501a658df9f8058a404d" 39SRCREV = "9a7eef1fec80e732451d501a658df9f8058a404d"
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 @@
1From 83046de497827a69bf05cd0b06ca6421b51e02b8 Mon Sep 17 00:00:00 2001
2From: J-P Nurmi <jpnurmi@qt.io>
3Date: Mon, 22 Jan 2018 10:58:06 +0100
4Subject: [PATCH] Control: fix background size regression caused by deferred
5 execution
6
7Task-number: QTBUG-65880
8Change-Id: Ic4f9fb087f4a78bd4c6257828011240186b6b22e
9Reviewed-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
15diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
16index 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);
27diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
28index 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 }
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
deleted file mode 100644
index b546098..0000000
--- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend
+++ /dev/null
@@ -1,34 +0,0 @@
1############################################################################
2##
3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
31
32SRC_URI += " \
33 file://0001-Control-fix-background-size-regression-caused-by-def.patch \
34 "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 48329fe..96bcf7f 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -24,7 +24,7 @@
24 path="sources/meta-openembedded"/> 24 path="sources/meta-openembedded"/>
25 <project name="meta-qt5" 25 <project name="meta-qt5"
26 remote="qtyocto" 26 remote="qtyocto"
27 revision="a96836aedf30d2e26fbcafc13b1313d1325a0730" 27 revision="144a388b5f8d6f76858469a160714a0cec811ecb"
28 path="sources/meta-qt5"/> 28 path="sources/meta-qt5"/>
29 <project name="meta-mingw" 29 <project name="meta-mingw"
30 remote="qtyocto" 30 remote="qtyocto"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-12 21:44:30 +0000