diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-06 08:07:33 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-06 08:07:33 +0300 |
| commit | 7d0ec758e43f46f067464da0a4f4f94dbfec9556 (patch) | |
| tree | a7f3d2c0b284ab8d52bd7ee229e0052394cf98ed /recipes-qt/qt5/qtbase_git.bb | |
| parent | 1716c294770b10e41af1b11cbe820ca857168556 (diff) | |
| parent | c1deb9aafe5fe20de1175944ed863e6d94dad71b (diff) | |
| download | meta-qt5-7d0ec758e43f46f067464da0a4f4f94dbfec9556.tar.gz | |
Merge remote-tracking branch 'qtyocto/5.12' into 5.13
* qtyocto/5.12:
ogl-runtime: Fix format-security issues
ogl-runtime: fix build errors
qtvirtualkeyboard: update supported layouts
qt3d-runtime: update to ogl-runtime v2.4
qtbase: update module
qt5: update submodules
qt5: update submodules
qtbase: fix build with gcc-9
qtlocation: add PACKAGECONFIGs for geoservices
qmake5_base.bbclass: Don't expand find -name search patterns
qt5: update submodules
Change-Id: Id6648d939ba54df0719660ace40d45fa3f1e1fbe
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 5e4a89b2..b44b3d49 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 14 | 14 | ||
| 15 | # common for qtbase-native, qtbase-nativesdk and qtbase | 15 | # common for qtbase-native, qtbase-nativesdk and qtbase |
| 16 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared | 16 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared |
| 17 | # 5.12.meta-qt5-shared.7 | 17 | # 5.12.meta-qt5-shared.8 |
| 18 | SRC_URI += "\ | 18 | SRC_URI += "\ |
| 19 | file://0001-Add-linux-oe-g-platform.patch \ | 19 | file://0001-Add-linux-oe-g-platform.patch \ |
| 20 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 20 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |