diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-06 01:00:08 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-11-06 19:44:29 +0100 |
| commit | 75f791419c54311e1ebf14a0c1651192ab0349f1 (patch) | |
| tree | bcdf78298f7978603aec570b4c9ef66e06819fc7 /src/corelib | |
| parent | b274f656b82e06fad492e241dae6ae65cb377ad1 (diff) | |
| parent | e3cc16e9fba045b3d195bc0e35dff4735bb6f59c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qsimd_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index c28624a25e..26e98c4542 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -346,7 +346,7 @@ extern Q_CORE_EXPORT QBasicAtomicInteger<unsigned> qt_cpu_features[2]; #endif Q_CORE_EXPORT quint64 qDetectCpuFeatures(); -#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) +#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) && !defined(QT_BOOTSTRAPPED) Q_CORE_EXPORT qsizetype qRandomCpu(void *, qsizetype) noexcept; #else static inline qsizetype qRandomCpu(void *, qsizetype) noexcept |