aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-05-27 15:22:21 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-05-27 15:54:32 +0200
commitb434031733b5fc0889ce89af669950f6b1cd9aa1 (patch)
tree8084e310049308bb58ab9a603508ca17c9b61c96 /recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
parentcfcd40e3d01bd2db8ec9617c8117b91fe7c41c8d (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/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch')
-rw-r--r--recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
index fc052c66..92a97b29 100644
--- a/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
+++ b/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
@@ -1,4 +1,4 @@
-From 75050b24ee94d078a3e987535aef6cbaac561c69 Mon Sep 17 00:00:00 2001
+From 812ed2c2f89c6df731d7698fe2bf253e3afa179a Mon Sep 17 00:00:00 2001
From: ibinderwolf <daniel@bluepattern.net>
Date: Wed, 26 Jun 2019 09:46:48 +0200
Subject: [PATCH] cmake Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -8,7 +8,7 @@ Subject: [PATCH] cmake Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in b/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in
-index 4907ded..34729da 100644
+index f98c37a..0f8aee5 100644
--- a/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in
+++ b/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in
@@ -40,7 +40,7 @@ if (NOT TARGET Qt5::repc)