diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-09-27 13:42:42 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-08 07:39:34 +0300 |
commit | 1ea6aae90a13137520796126434b6ebd36a797ec (patch) | |
tree | dbbc346e074a658b1c27ecd288fabbdb2b0ec921 | |
parent | 60e1ae791c6c7572e5189f6747002ba2e3cf5863 (diff) |
meta-qt5: update layerv5.14.0-beta1
Update to latest content in Qt 5.14 branch.
Changelog:
c8a3fd4 qt5: update submodules
de93586 qt5: update submodules
e127a6b qtlocation: use geoclue 2
61d0a61 ogl-runtime: update to v2.5.0-beta1
Task-number: QTBUG-77876
Change-Id: Ife41dc6a0819e0c3fa682edea326c7bab442735d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 7 | ||||
-rw-r--r-- | meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch | 25 | ||||
-rw-r--r-- | scripts/manifest.xml | 2 |
3 files changed, 4 insertions, 30 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 ac0a0ac1..01327dcd 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -41,9 +41,8 @@ PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" fakeroot do_generate_qt_environment_file_mingw32() { } -SRC_URI_append_mingw32 = "\ - file://0001-disable-qt_random_cpu.patch \ - " - # qdatetime.cpp: error: 'localtime_r' was not declared in this scope QT_CONFIG_FLAGS_append_mingw32 = " -D_POSIX_C_SOURCE" + +# workaround for QTBUG-64707 +QT_CONFIG_FLAGS_append_mingw32 = " -no-feature-rdrnd" diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch deleted file mode 100644 index 8154a9fd..00000000 --- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b6ce0e176c0c3520ce6b42cea8cc9e2c6c760879 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Thu, 23 Nov 2017 11:28:47 +0200 -Subject: [PATCH] disable qt_random_cpu - -The code caused internal compiler error when compiling for mingw32 - -Change-Id: Ieba798a9599a6d683c6630c6cd3731b2b909b628 ---- - src/corelib/global/qrandom.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 2ee8f0dd01..7e082f6f6c 100644 ---- a/src/corelib/global/qrandom.cpp -+++ b/src/corelib/global/qrandom.cpp -@@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando - - QT_BEGIN_NAMESPACE - --#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) -+#if 0 - static qsizetype qt_random_cpu(void *buffer, qsizetype count) noexcept; - - # ifdef Q_PROCESSOR_X86_64 diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 8f876733..e057645f 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -23,7 +23,7 @@ path="sources/meta-openembedded"/> <project name="meta-qt5" remote="qtyocto" - revision="35fa091938fcffbc5efd0c79ae2221e67bd0ae97" + revision="c8a3fd4b856e6f71d4811da2a0514c7656687c35" path="sources/meta-qt5"/> <project name="meta-mingw" remote="qtyocto" |