diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-14 11:17:40 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-15 05:12:10 +0000 |
| commit | 2884c652b5b2d186eb1c43fd8ecb82df83a581c9 (patch) | |
| tree | 135f2e247de339790cb8c5dd4c73466bdb0405a7 | |
| parent | 26141086963d1c6ea9451e17c831d748690cf44d (diff) | |
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>
| -rw-r--r-- | src/corelib/global/qrandom.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp index 58458d6984..72ac8d332b 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -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); |