diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-15 10:14:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-15 10:14:11 +0100 |
| commit | bb0fec8057dd11c359bfcb4aefb66d9b210f52a6 (patch) | |
| tree | 903e3220087ff7a3210390933ba3d8b8f7eb5ea3 /src/corelib/global/qrandom.cpp | |
| parent | 8920bf32eebe03cfc8a1a5e97f5b34c09c79a11b (diff) | |
| parent | 4ba535616b8d3dfda7fbe162c6513f3008c1077a (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
src/corelib/corelib.pro
src/corelib/global/qrandom.cpp
src/network/access/qhttpnetworkrequest_p.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoansmenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/offscreen/qoffscreenintegration.h
src/widgets/kernel/qaction.cpp
src/widgets/widgets.pro
Done-with: Andy Shaw <andy.shaw@qt.io>
Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d
Diffstat (limited to 'src/corelib/global/qrandom.cpp')
| -rw-r--r-- | src/corelib/global/qrandom.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp index 6c26d4682d..9143e04d45 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -74,7 +74,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando } #endif -#if defined(Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) # include <private/qjni_p.h> #endif |