diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-31 09:24:47 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-02-01 06:58:41 +0000 |
| commit | dbd07446e02da51c9ea8fe6543ad156a9c656069 (patch) | |
| tree | 85cec18e181e91261c02b108a0c0617f5d20e606 /meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | |
| parent | 12f3a11c1930152c17c70e34dc01c80feca20333 (diff) | |
| download | meta-boot2qt-dbd07446e02da51c9ea8fe6543ad156a9c656069.tar.gz | |
mingw: update meta-mingw layer and fix qtbase build
Thud branch is missing some of the fixes required for cmake, so use
sha1 from master branch. This needs a fix for for nativesdk-qtbase as
mingw64 headers have conflict depending on which order time.h and
pthread.h are included, causing error:
"qdatetime.cpp: error: 'localtime_r' was not declared in this scope"
Change-Id: Ie3faf69302594c1bead3bd0a5cc4bb2205c587ea
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend')
| -rw-r--r-- | meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 36b4409..df45875 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | |||
| @@ -46,3 +46,6 @@ fakeroot do_generate_qt_environment_file_mingw32() { | |||
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | SRC_URI_append_mingw32 = "file://0001-disable-qt_random_cpu.patch" | 48 | SRC_URI_append_mingw32 = "file://0001-disable-qt_random_cpu.patch" |
| 49 | |||
| 50 | # qdatetime.cpp: error: 'localtime_r' was not declared in this scope | ||
| 51 | QT_CONFIG_FLAGS_append_mingw32 = " -D_POSIX_C_SOURCE" | ||