diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-03-20 13:48:43 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-08-24 09:22:19 +0000 |
commit | 5708d0d71679fc85c0efd4de234a8f1f030d63dd (patch) | |
tree | 4c0bbdf5a09914428c5fdbc1c7af9e8941dd4b22 /meta-boot2qt-distro/recipes-qt | |
parent | feac3edc2ab20b106e1f50f3401d60a2355f5178 (diff) | |
download | meta-boot2qt-5708d0d71679fc85c0efd4de234a8f1f030d63dd.tar.gz |
qtquicktimeline: fetch from public repository
Repository is now public, so we can treat it as a regular qt5 module.
Remove qmlpreview recipe as that's part of qtdeclarative in 5.12.
Task-number: QTPM-1153
Change-Id: I9bf608136c956124c83c23d50b52f4050bde10c5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt-distro/recipes-qt')
-rw-r--r-- | meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 5 | ||||
-rw-r--r-- | meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 646239f..c1d7f26 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | |||
@@ -62,6 +62,7 @@ RDEPENDS_${PN} += " \ | |||
62 | qtotaupdate-dev \ | 62 | qtotaupdate-dev \ |
63 | qtquickcontrols-dev \ | 63 | qtquickcontrols-dev \ |
64 | qtquickcontrols2-dev \ | 64 | qtquickcontrols2-dev \ |
65 | qtquicktimeline-dev \ | ||
65 | qtremoteobjects-dev \ | 66 | qtremoteobjects-dev \ |
66 | qtscxml-dev \ | 67 | qtscxml-dev \ |
67 | qtsensors-dev \ | 68 | qtsensors-dev \ |
@@ -77,7 +78,3 @@ RDEPENDS_${PN} += " \ | |||
77 | qtwebchannel-dev \ | 78 | qtwebchannel-dev \ |
78 | qtxmlpatterns-dev \ | 79 | qtxmlpatterns-dev \ |
79 | " | 80 | " |
80 | |||
81 | RDEPENDS_${PN} += "\ | ||
82 | ${@ "qtquicktimeline-dev" if (d.getVar("QT_INTERNAL_BUILD")) else "" } \ | ||
83 | " | ||
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index cd5f35f..38bddaa 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | |||
@@ -54,6 +54,7 @@ RDEPENDS_${PN} += " \ | |||
54 | qtotaupdate \ | 54 | qtotaupdate \ |
55 | qtquickcontrols \ | 55 | qtquickcontrols \ |
56 | qtquickcontrols2 \ | 56 | qtquickcontrols2 \ |
57 | qtquicktimeline \ | ||
57 | qtremoteobjects \ | 58 | qtremoteobjects \ |
58 | qtscxml \ | 59 | qtscxml \ |
59 | qtsensors \ | 60 | qtsensors \ |
@@ -79,7 +80,3 @@ RDEPENDS_${PN} += " \ | |||
79 | qtxmlpatterns \ | 80 | qtxmlpatterns \ |
80 | qtvirtualkeyboard \ | 81 | qtvirtualkeyboard \ |
81 | " | 82 | " |
82 | |||
83 | RDEPENDS_${PN} += "\ | ||
84 | ${@ "qtquicktimeline qmlpreview" if (d.getVar("QT_INTERNAL_BUILD")) else "" } \ | ||
85 | " | ||