1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation for embedded Android

Browse Source 
Change-Id: If42fd83a68543d59b5a3a6b89e2c402aa452b251
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
aavit 2013-11-11 11:04:16 +01:00 committed by The Qt Project
parent bf246e6c28
commit 0a1cb466df
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/global/qglobal.cpp
View File

@ -76,7 +76,7 @@
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#endif #endif
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
#include <private/qjni_p.h> #include <private/qjni_p.h>
#endif #endif
@ -2387,7 +2387,7 @@ typedef uint SeedStorageType;
typedef QThreadStorage<SeedStorageType *> SeedStorage; typedef QThreadStorage<SeedStorageType *> SeedStorage;
Q_GLOBAL_STATIC(SeedStorage, randTLS) // Thread Local Storage for seed value Q_GLOBAL_STATIC(SeedStorage, randTLS) // Thread Local Storage for seed value
#elif defined(Q_OS_ANDROID) #elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
typedef QThreadStorage<QJNIObjectPrivate> AndroidRandomStorage; typedef QThreadStorage<QJNIObjectPrivate> AndroidRandomStorage;
Q_GLOBAL_STATIC(AndroidRandomStorage, randomTLS) Q_GLOBAL_STATIC(AndroidRandomStorage, randomTLS)
#endif #endif
@ -2423,7 +2423,7 @@ void qsrand(uint seed)
//global static object, fallback to srand(seed) //global static object, fallback to srand(seed)
srand(seed); srand(seed);
} }
#elif defined(Q_OS_ANDROID) #elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
if (randomTLS->hasLocalData()) { if (randomTLS->hasLocalData()) {
randomTLS->localData().callMethod<void>("setSeed", "(J)V", jlong(seed)); randomTLS->localData().callMethod<void>("setSeed", "(J)V", jlong(seed));
return; return;
@ -2479,7 +2479,7 @@ int qrand()
//global static object, fallback to rand() //global static object, fallback to rand()
return rand(); return rand();
} }
#elif defined(Q_OS_ANDROID) #elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
AndroidRandomStorage *randomStorage = randomTLS(); AndroidRandomStorage *randomStorage = randomTLS();
if (!randomStorage) if (!randomStorage)
return rand(); return rand();