diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-05-27 15:22:21 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-05-27 15:54:32 +0200 |
| commit | b434031733b5fc0889ce89af669950f6b1cd9aa1 (patch) | |
| tree | 8084e310049308bb58ab9a603508ca17c9b61c96 /recipes-qt/qt5/qtdeclarative | |
| parent | cfcd40e3d01bd2db8ec9617c8117b91fe7c41c8d (diff) | |
qt5: upgrade to 5.15.0
* https://www.qt.io/blog/qt-5.15-released
* continue to use latest revision in 5.15 (and 80-based) branch for
qtwebengine, because we were already using newer than v5.15.0 revision
and some of those fixes are needed for master (e.g. for build with gcc-10)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative')
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch | 4 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch b/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch index 60922e74..6336e524 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch @@ -1,4 +1,4 @@ -From d39e76b9662ea9cf236ac59749855e7da7ad29a8 Mon Sep 17 00:00:00 2001 +From cd88a299fa46b2a1be2dbdbda7d6abd77e4edb23 Mon Sep 17 00:00:00 2001 From: Piotr Tworek <tworaz@tworaz.net> Date: Wed, 3 Jul 2019 01:13:40 +0200 Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to locate qmlcachegen @@ -14,7 +14,7 @@ Signed-off-by: Piotr Tworek <tworaz@tworaz.net> 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in -index 75fbb0fcf3..1e949cd40c 100644 +index be2113b258..ce28345cad 100644 --- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in +++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in @@ -18,11 +18,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles) diff --git a/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch b/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch index f55812b6..9ee83b39 100644 --- a/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch +++ b/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch @@ -1,4 +1,4 @@ -From 838fb4676f78d169dc88f87544cf1a4003302aea Mon Sep 17 00:00:00 2001 +From cfbc554f137ce5ee6497045fc23ebe8576361786 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 26 Nov 2019 21:10:03 -0800 Subject: [PATCH] Use python3 explicitly |