diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-14 18:37:41 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-02 15:16:18 +0200 |
| commit | bf2cafa909a27250f853a823e9d7101307337e7a (patch) | |
| tree | 3b70ffa8f12510fb777a42ce7d6eedf4886819d3 /recipes-qt/qt5/qtdeclarative | |
| parent | c1b0c9f546289b1592d7a895640de103723a0305 (diff) | |
| download | meta-qt5-bf2cafa909a27250f853a823e9d7101307337e7a.tar.gz | |
qt5: upgrade to latest revisions in 5.7 branches
* these revisions are after v5.7.0-beta1 tags where available
* it's highly recommended to read:
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
to find out how you're affected check which files/tools are
included in your builds, e.g. for qtwebengine:
OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c
11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$
67 ** $QT_BEGIN_LICENSE:BSD$
17 ** $QT_BEGIN_LICENSE:FDL$
61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$
261 ** $QT_BEGIN_LICENSE:LGPL$
* change in chromium's LICENSE is only copyright year update
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative')
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | 31 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch | 2 |
2 files changed, 10 insertions, 23 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch index ee568200..1a8a5f0f 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From d26a676827ef2d64b4627090690d3240e62f6565 Mon Sep 17 00:00:00 2001 | 1 | From c978b2ed0e1ce48b2d4a4a6eb660927bc88aed57 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> |
| 3 | Date: Sun, 26 May 2013 14:26:19 +0200 | 3 | Date: Sun, 26 May 2013 14:26:19 +0200 |
| 4 | Subject: [PATCH] qmltestexample: fix link | 4 | Subject: [PATCH] qmltestexample: fix link |
| @@ -15,12 +15,11 @@ Change-Id: I63088ff73bec6a8559dfae132f8bd40b62487450 | |||
| 15 | Signed-off-by: Eric Bénard <eric@eukrea.com> | 15 | Signed-off-by: Eric Bénard <eric@eukrea.com> |
| 16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 17 | --- | 17 | --- |
| 18 | examples/qmltest/qmltest/qmltest.pro | 2 +- | 18 | examples/qmltest/qmltest/qmltest.pro | 2 +- |
| 19 | tests/auto/qml/qjsengine/qjsengine.pro | 2 +- | 19 | tests/auto/qml/qjsengine/qjsengine.pro | 2 +- |
| 20 | tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | 2 +- | 20 | tests/auto/qmltest/qmltest.pro | 1 + |
| 21 | tests/auto/qmltest/qmltest.pro | 1 + | 21 | tools/qmltestrunner/qmltestrunner.pro | 2 +- |
| 22 | tools/qmltestrunner/qmltestrunner.pro | 2 +- | 22 | 4 files changed, 4 insertions(+), 3 deletions(-) |
| 23 | 5 files changed, 5 insertions(+), 4 deletions(-) | ||
| 24 | 23 | ||
| 25 | diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro | 24 | diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro |
| 26 | index b5893c5..1b00e6c 100644 | 25 | index b5893c5..1b00e6c 100644 |
| @@ -36,31 +35,19 @@ index b5893c5..1b00e6c 100644 | |||
| 36 | macx: CONFIG -= app_bundle | 35 | macx: CONFIG -= app_bundle |
| 37 | 36 | ||
| 38 | diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro | 37 | diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro |
| 39 | index fc2452c..919710f 100644 | 38 | index c9d78e2..5861613 100644 |
| 40 | --- a/tests/auto/qml/qjsengine/qjsengine.pro | 39 | --- a/tests/auto/qml/qjsengine/qjsengine.pro |
| 41 | +++ b/tests/auto/qml/qjsengine/qjsengine.pro | 40 | +++ b/tests/auto/qml/qjsengine/qjsengine.pro |
| 42 | @@ -1,7 +1,7 @@ | 41 | @@ -1,6 +1,6 @@ |
| 43 | CONFIG += testcase | 42 | CONFIG += testcase |
| 44 | CONFIG += parallel_test | ||
| 45 | TARGET = tst_qjsengine | 43 | TARGET = tst_qjsengine |
| 46 | -QT += qml qml-private widgets testlib gui-private | 44 | -QT += qml qml-private widgets testlib gui-private |
| 47 | +QT += qml qml-private widgets testlib gui-private quick | 45 | +QT += qml qml-private widgets testlib gui-private quick |
| 48 | macx:CONFIG -= app_bundle | 46 | macx:CONFIG -= app_bundle |
| 49 | SOURCES += tst_qjsengine.cpp | 47 | SOURCES += tst_qjsengine.cpp |
| 50 | RESOURCES += qjsengine.qrc | 48 | RESOURCES += qjsengine.qrc |
| 51 | diff --git a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | ||
| 52 | index c6d442e..3181dcd 100644 | ||
| 53 | --- a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | ||
| 54 | +++ b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | ||
| 55 | @@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle | ||
| 56 | |||
| 57 | TESTDATA = data/* | ||
| 58 | |||
| 59 | -QT += core-private qml-private testlib gui gui-private | ||
| 60 | +QT += core-private qml-private testlib gui gui-private quick | ||
| 61 | DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 | ||
| 62 | diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro | 49 | diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro |
| 63 | index 7662cb1..a8f8ae2 100644 | 50 | index 54db7a7..8c6986c 100644 |
| 64 | --- a/tests/auto/qmltest/qmltest.pro | 51 | --- a/tests/auto/qmltest/qmltest.pro |
| 65 | +++ b/tests/auto/qmltest/qmltest.pro | 52 | +++ b/tests/auto/qmltest/qmltest.pro |
| 66 | @@ -4,6 +4,7 @@ CONFIG += qmltestcase | 53 | @@ -4,6 +4,7 @@ CONFIG += qmltestcase |
diff --git a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch index 60c9685f..dc707abf 100644 --- a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch +++ b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 9d39293e354120a9ec5e92c87b4cd695acdeb3f5 Mon Sep 17 00:00:00 2001 | 1 | From 493e91c9c3527d577f7051de9a582a178ca43fcf Mon Sep 17 00:00:00 2001 |
| 2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
| 3 | Date: Thu, 31 Mar 2016 19:38:58 -0400 | 3 | Date: Thu, 31 Mar 2016 19:38:58 -0400 |
| 4 | Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been | 4 | Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been |
