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/qtbase-native_git.bb | |
| 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/qtbase-native_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 5bec8220..4c146928 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -18,7 +18,7 @@ require qt5-git.inc | |||
| 18 | 18 | ||
| 19 | # common for qtbase-native, qtbase-nativesdk and qtbase | 19 | # common for qtbase-native, qtbase-nativesdk and qtbase |
| 20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared | 20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared |
| 21 | # 5.14.meta-qt5-shared.1 | 21 | # 5.14.meta-qt5-shared.2 |
| 22 | SRC_URI += "\ | 22 | SRC_URI += "\ |
| 23 | file://0001-Add-linux-oe-g-platform.patch \ | 23 | file://0001-Add-linux-oe-g-platform.patch \ |
| 24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
| @@ -41,7 +41,7 @@ SRC_URI += "\ | |||
| 41 | 41 | ||
| 42 | # common for qtbase-native and nativesdk-qtbase | 42 | # common for qtbase-native and nativesdk-qtbase |
| 43 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native | 43 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native |
| 44 | # 5.14.meta-qt5-native.1 | 44 | # 5.14.meta-qt5-native.2 |
| 45 | SRC_URI += " \ | 45 | SRC_URI += " \ |
| 46 | file://0019-Always-build-uic-and-qvkgen.patch \ | 46 | file://0019-Always-build-uic-and-qvkgen.patch \ |
| 47 | file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \ | 47 | file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \ |