From 5708d0d71679fc85c0efd4de234a8f1f030d63dd Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 20 Mar 2018 13:48:43 +0200
Subject: 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>
---
 meta-boot2qt/recipes-qt/qt5/qmlpreview_git.bb      | 44 ----------------------
 meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb | 17 +++++----
 2 files changed, 9 insertions(+), 52 deletions(-)
 delete mode 100644 meta-boot2qt/recipes-qt/qt5/qmlpreview_git.bb

(limited to 'meta-boot2qt')

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 @@
-############################################################################
-##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-
-DESCRIPTION = "QML Live Preview debug service"
-LICENSE = "The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
-
-inherit qt5-module
-require recipes-qt/qt5/qt5-git.inc
-
-SRCREV = "6ae4a9da17e53bbb7c1729c24f58141a33bbcb9b"
-BRANCH = "master"
-
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/tqtc-qmlpreview;branch=${BRANCH};protocol=ssh \
-    "
-
-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 @@
 ############################################################################
 
 DESCRIPTION = "Qt Quick Timeline"
-LICENSE = "The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+LICENSE = "( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    "
 
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-SRCREV = "7ee1adca536b422623de1fe8da44135aeee6e9cf"
-BRANCH = "dev"
+DEPENDS = "qtbase qtdeclarative"
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/tqtc-qtquicktimeline;branch=${BRANCH};protocol=ssh \
-    "
+QT_MODULE_BRANCH = "dev"
 
-DEPENDS = "qtbase qtdeclarative"
+SRCREV = "42415a5b7a13b92701ccc7be70f9cdb7e522a3ea"
-- 
cgit v1.2.3-54-g00ecf