diff options
| author | Jani Suonpera <jani.suonpera@qt.io> | 2020-11-25 15:38:29 +0200 |
|---|---|---|
| committer | Jani Suonpera <jani.suonpera@qt.io> | 2020-12-04 09:43:52 +0200 |
| commit | 19d99b10df41b7875b3c788bc7a9d1a88734e644 (patch) | |
| tree | dc987a79b9ad1810bedfa8221533b550cf1662cc /recipes-qt/qt5/qtbase-native_git.bb | |
| parent | 545be38961a2e287c64f2ae607569e88da4bfa8b (diff) | |
| parent | 7a9f639fbd632dbe23af95c7b8123a0b907c6179 (diff) | |
| download | meta-qt5-19d99b10df41b7875b3c788bc7a9d1a88734e644.tar.gz | |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
Task-number: QTBUG-88755
Change-Id: I7adf9d6bb5fb8a2b0893d1c4b142db73996f20b9
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index bfd1a805..4be4aaa8 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -36,6 +36,7 @@ SRC_URI += "\ | |||
| 36 | file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ | 36 | file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ |
| 37 | file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 37 | file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
| 38 | file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ | 38 | file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ |
| 39 | file://0019-Define-__NR_futex-if-it-does-not-exist.patch \ | ||
| 39 | " | 40 | " |
| 40 | 41 | ||
| 41 | # common for qtbase-native and nativesdk-qtbase | 42 | # common for qtbase-native and nativesdk-qtbase |