diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-06-25 15:03:43 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-06-25 15:04:36 +0300 |
| commit | 364eb068de13c57b6f8ffdac90a88ec14ca71912 (patch) | |
| tree | 9acb2be49af4d84ea5c944294f821a9b8551cb61 /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
| parent | be7aa4b95623ca068a4c7f84edf6c74e03c8854f (diff) | |
| parent | 2a5f9415e48a38f6f4eb0cf375737a2d8438e2fe (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
* qtyocto/upstream/warrior:
2a5f941 qtbase: fix build with gcc-9
8bc72a7 qtlocation: add PACKAGECONFIGs for geoservices
46c87e0 qmake5_base.bbclass: Don't expand find -name search patterns
Change-Id: I99658e8311a90d752f92ac486040b24bc98cefb2
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 539ab4e6..411b85d0 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.7 +# 5.12.meta-qt5-shared.8 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -41,14 +41,15 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0017-Fix-Wdeprecated-copy-warnings.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.7 +# 5.12.meta-qt5-native.8 SRC_URI += " \ - file://0017-Always-build-uic-and-qvkgen.patch \ - file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0018-Always-build-uic-and-qvkgen.patch \ + file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ " # CMake's toolchain configuration of nativesdk-qtbase |