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 /scripts | |
| 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 'scripts')
| -rw-r--r-- | scripts/manifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 64f6bcc..b39cba4 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | path="sources/meta-qt5"/> | 30 | path="sources/meta-qt5"/> |
| 31 | <project name="meta-mingw" | 31 | <project name="meta-mingw" |
| 32 | remote="qtyocto" | 32 | remote="qtyocto" |
| 33 | revision="628dcfed62ce8dcc408e5b4a5e5c0aaa921b20ad" | 33 | revision="fa4ea76d93c87a2ad3ce88b052c282106b2761e4" |
| 34 | path="sources/meta-mingw"/> | 34 | path="sources/meta-mingw"/> |
| 35 | 35 | ||
| 36 | <project name="meta-freescale" | 36 | <project name="meta-freescale" |