diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-06 12:32:13 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-10 18:16:10 +0200 |
| commit | 65028944ee13f5fa7939aa0b669ecc8ad358012d (patch) | |
| tree | b0bd5fcacb9b26cdfbcdbe8b9cf5568f59a8a729 /recipes-qt/qt5/qtbase_git.bb | |
| parent | eb59ee61d4bc967673346bc16f6585f7ab7cee55 (diff) | |
| parent | 5114e3057ceb4afc7f2ae9f71bb351f9e5c7f553 (diff) | |
Merge "Merge remote-tracking branch 'qt/5.14' into 5.15"
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 0fc2697d..2446ca43 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared -# 5.14.meta-qt5-shared.1 +# 5.14.meta-qt5-shared.2 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -33,6 +33,7 @@ SRC_URI += "\ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ + file://0022-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ " # for syncqt |