diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-12 20:25:55 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-12 20:26:34 +0200 |
| commit | 5b2109a88ee8e8a769190e640661434d98b62548 (patch) | |
| tree | 13ec544f89bf10755025c683470a42f29f0f186d /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
| parent | e4e2acba9fe7e6c5903770b26ae374b74051d91c (diff) | |
| parent | 25039161c1646ce1b6cc30303d4588e43b9b714a (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into 5.14
Notes:
- Patch already present in 5.14 branch for qtwebengine musl build
kept and upstream one (1a4ee018 qtwebengine: Fix musl build)
discarded as that does not work with present content
- Patch for time_t in qtbase (f6ad80f9 qtbase: Fix build on 32bit arches
with 64bit time_t) is faulty, fixed in next commit
* qt/upstream/master:
25039161 qtwebengine: Fix build with 64bit time_t on 32bit architectures
4f3ed3ed qtwebkit: add missing flex-native dep
456ec4ac qt5-creator, qtbase: Replace python with python3
f264e5dd qtdeclarative: Ask for python3 explicitly
f6ad80f9 qtbase: Fix build on 32bit arches with 64bit time_t
b7f4bd20 recipes: Use features_check instead of distro_features_check
1a4ee018 qtwebengine: Fix musl build
02715fff pyqt5: Upgrade to 5.13.2
Conflicts:
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtwebengine_git.bb
Change-Id: I650cc667ede8f68f85164f52835b5e9f8db213f5
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 461f0d75..34349570 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -42,6 +42,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://0017-qfloat16-check-for-__ARM_FP-2.patch \ + file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ " # common for qtbase-native and nativesdk-qtbase |