whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A brute-force solution to get QRandomGenerator build on Integrity 

Task-number: QTBUG-64451
Change-Id: Ife11c3448f54609ba6e85a269a3b5376c43a075f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Liang Qi 2017-11-14 11:17:40 +01:00
parent 2614108696
commit 2884c652b5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/global/qrandom.cpp
View File

@ -411,11 +411,12 @@ struct QRandomGenerator::SystemAndGlobalGenerators
void confirmLiteral()
{
#if defined(Q_COMPILER_CONSTEXPR) && !defined(Q_CC_MSVC)
#if defined(Q_COMPILER_CONSTEXPR) && !defined(Q_CC_MSVC) && !defined(Q_OS_INTEGRITY)
// Currently fails to compile with MSVC 2017, saying QBasicMutex is not
// a literal type. Disassembly with MSVC 2013 and 2015 shows it is
// actually a literal; MSVC 2017 has a bug relating to this, so we're
// withhold judgement for now.
// withhold judgement for now. Integrity's compiler is unable to
// guarantee g's alignment for some reason.
constexpr SystemAndGlobalGenerators g = {};
Q_UNUSED(g);