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 | |
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')
-rw-r--r-- | meta-boot2qt/recipes-qt/qt5/qmlpreview_git.bb | 44 | ||||
-rw-r--r-- | meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb | 17 |
2 files changed, 9 insertions, 52 deletions
diff --git a/meta-boot2qt/recipes-qt/qt5/qmlpreview_git.bb b/meta-boot2qt/recipes-qt/qt5/qmlpreview_git.bb deleted file mode 100644 index 1de4199..0000000 --- a/meta-boot2qt/recipes-qt/qt5/qmlpreview_git.bb +++ /dev/null | |||
@@ -1,44 +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 | |||
30 | DESCRIPTION = "QML Live Preview debug service" | ||
31 | LICENSE = "The-Qt-Company-Commercial" | ||
32 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" | ||
33 | |||
34 | inherit qt5-module | ||
35 | require recipes-qt/qt5/qt5-git.inc | ||
36 | |||
37 | SRCREV = "6ae4a9da17e53bbb7c1729c24f58141a33bbcb9b" | ||
38 | BRANCH = "master" | ||
39 | |||
40 | SRC_URI = " \ | ||
41 | git://codereview.qt-project.org/qt/tqtc-qmlpreview;branch=${BRANCH};protocol=ssh \ | ||
42 | " | ||
43 | |||
44 | DEPENDS = "qtbase qtdeclarative" | ||
diff --git a/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb b/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb index 74a66c0..a28022d 100644 --- a/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb +++ b/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb | |||
@@ -28,17 +28,18 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DESCRIPTION = "Qt Quick Timeline" | 30 | DESCRIPTION = "Qt Quick Timeline" |
31 | LICENSE = "The-Qt-Company-Commercial" | 31 | LICENSE = "( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" |
32 | LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" | 32 | LIC_FILES_CHKSUM = " \ |
33 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
34 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
35 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | ||
36 | " | ||
33 | 37 | ||
34 | inherit qt5-module | 38 | inherit qt5-module |
35 | require recipes-qt/qt5/qt5-git.inc | 39 | require recipes-qt/qt5/qt5-git.inc |
36 | 40 | ||
37 | SRCREV = "7ee1adca536b422623de1fe8da44135aeee6e9cf" | 41 | DEPENDS = "qtbase qtdeclarative" |
38 | BRANCH = "dev" | ||
39 | 42 | ||
40 | SRC_URI = " \ | 43 | QT_MODULE_BRANCH = "dev" |
41 | git://codereview.qt-project.org/qt/tqtc-qtquicktimeline;branch=${BRANCH};protocol=ssh \ | ||
42 | " | ||
43 | 44 | ||
44 | DEPENDS = "qtbase qtdeclarative" | 45 | SRCREV = "42415a5b7a13b92701ccc7be70f9cdb7e522a3ea" |