From 7f4374e0451cf3cc4101d675139372184a10a204 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Wed, 18 Nov 2015 10:32:33 +0200
Subject: qt5: upgrade to Qt 5.6

Move to latest revision of meta-qt5 that pulls in Qt 5.6.
- Qt Quick Compiler needs follow 5.6 branch.
- Disable compilation of qgltf host toool from Qt3D, that does not
compile with GCC 4.9.1

Change-Id: Idf0437cff1debf6db558959b357dae3279466163
Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
---
 recipes-qt/qt5-addons/qtquickcompiler_3.0.bb | 41 ----------------------------
 recipes-qt/qt5-addons/qtquickcompiler_git.bb | 41 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
 create mode 100644 recipes-qt/qt5-addons/qtquickcompiler_git.bb

(limited to 'recipes-qt/qt5-addons')

diff --git a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
deleted file mode 100644
index 6226e6e..0000000
--- a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://www.qt.io/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-DESCRIPTION = "Qt Quick Compiler"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca3193ae686c;beginline=1;endline=6"
-
-inherit qt5-module
-
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \
-    "
-
-# v3.0.0
-SRCREV = "7e29e55c8315cc5e944505f13c24893d0f54efeb"
-BRANCH = "3.0"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "qtbase qtdeclarative"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_git.bb b/recipes-qt/qt5-addons/qtquickcompiler_git.bb
new file mode 100644
index 0000000..1bd37e6
--- /dev/null
+++ b/recipes-qt/qt5-addons/qtquickcompiler_git.bb
@@ -0,0 +1,41 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "Qt Quick Compiler"
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca3193ae686c;beginline=1;endline=6"
+
+inherit qt5-module
+
+SRC_URI = " \
+    git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \
+    "
+
+# v5.6.0
+SRCREV = "07aeee460cc170eef28c05ce13aa30408f558215"
+BRANCH = "5.6"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "qtbase qtdeclarative"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
cgit v1.2.3-54-g00ecf