diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-02 14:39:52 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-03 10:01:14 +0200 |
| commit | af6cd54ed2b6d8834dbf09570dbe42460bd78b92 (patch) | |
| tree | cbb55ca0f320d53b82c69b1afe063b675a20147a /recipes-qt/qt5/qtremoteobjects | |
| parent | 2da972e58650f5d44f2cfd4fc1ec4e4dc1d2cd48 (diff) | |
| parent | f9a58d623762c5fd78bd6bc18d701a7aaa004567 (diff) | |
| download | meta-qt5-af6cd54ed2b6d8834dbf09570dbe42460bd78b92.tar.gz | |
Merge "Merge remote-tracking branch 'qt/upstream/master' into 5.14"
Diffstat (limited to 'recipes-qt/qt5/qtremoteobjects')
| -rw-r--r-- | recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch index 41ac90f1..d3113cd4 100644 --- a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From c4b36e140b1938c19e06e20c55d0861e67763912 Mon Sep 17 00:00:00 2001 | 1 | From 5f151a2148be90ca8c4470bea7b4358659c9fff1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
| 3 | Date: Wed, 7 Jun 2017 15:17:12 +0300 | 3 | Date: Wed, 7 Jun 2017 15:17:12 +0300 |
| 4 | Subject: [PATCH] Allow a tools-only build | 4 | Subject: [PATCH] Allow a tools-only build |
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 35fef269..fc052c66 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 @@ | |||
| 1 | From 11390088fdb719ee6ccb07c5ca98bb8e44cdef23 Mon Sep 17 00:00:00 2001 | 1 | From 75050b24ee94d078a3e987535aef6cbaac561c69 Mon Sep 17 00:00:00 2001 |
| 2 | From: ibinderwolf <daniel@bluepattern.net> | 2 | From: ibinderwolf <daniel@bluepattern.net> |
| 3 | Date: Wed, 26 Jun 2019 09:46:48 +0200 | 3 | Date: Wed, 26 Jun 2019 09:46:48 +0200 |
| 4 | Subject: [PATCH] cmake Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS | 4 | Subject: [PATCH] cmake Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS |