diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-05 15:24:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-05 15:24:53 +0000 |
| commit | df5159a8a6b6bf585feb1473054dec2ed5ddb11a (patch) | |
| tree | a56ad5c69e735eeeb1e93e01330ec2498f5ba497 /src/corelib/global/qglobal.cpp | |
| parent | 0683c9291f9c1ffe0625fdadee198840047f0e92 (diff) | |
| parent | f2856875843efce9a00e90dad05bde358ab82197 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index f485204f8b2..a2cbd94c921 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -77,7 +77,7 @@ # include <envLib.h> #endif -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) #include <private/qjni_p.h> #endif @@ -944,7 +944,7 @@ Q_STATIC_ASSERT_X(QT_POINTER_SIZE == sizeof(void *), "QT_POINTER_SIZE defined in \relates <QtGlobal> \since 5.7 - Returns a pointer to a constant member function: + Returns the \a memberFunctionPointer pointer to a constant member function: \snippet code/src_corelib_global_qglobal.cpp 54 @@ -955,7 +955,7 @@ Q_STATIC_ASSERT_X(QT_POINTER_SIZE == sizeof(void *), "QT_POINTER_SIZE defined in \relates <QtGlobal> \since 5.7 - Returns a pointer to a non-constant member function: + Returns the \a memberFunctionPointer pointer to a non-constant member function: \snippet code/src_corelib_global_qglobal.cpp 54 @@ -2689,10 +2689,8 @@ QString QSysInfo::productVersion() // fall through // Android should not fall through to the Unix code -#elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#elif defined(Q_OS_ANDROID) return QJNIObjectPrivate::getStaticObjectField("android/os/Build$VERSION", "RELEASE", "Ljava/lang/String;").toString(); -#elif defined(Q_OS_ANDROID) // Q_OS_ANDROID_NO_SDK - // TBD #elif defined(USE_ETC_OS_RELEASE) // Q_OS_UNIX QUnixOSVersion unixOsVersion; findUnixOsVersion(unixOsVersion); @@ -3381,7 +3379,7 @@ typedef uint SeedStorageType; typedef QThreadStorage<SeedStorageType *> SeedStorage; Q_GLOBAL_STATIC(SeedStorage, randTLS) // Thread Local Storage for seed value -#elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#elif defined(Q_OS_ANDROID) typedef QThreadStorage<QJNIObjectPrivate> AndroidRandomStorage; Q_GLOBAL_STATIC(AndroidRandomStorage, randomTLS) #endif @@ -3417,7 +3415,7 @@ void qsrand(uint seed) //global static object, fallback to srand(seed) srand(seed); } -#elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#elif defined(Q_OS_ANDROID) if (randomTLS->hasLocalData()) { randomTLS->localData().callMethod<void>("setSeed", "(J)V", jlong(seed)); return; @@ -3473,7 +3471,7 @@ int qrand() //global static object, fallback to rand() return rand(); } -#elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#elif defined(Q_OS_ANDROID) AndroidRandomStorage *randomStorage = randomTLS(); if (!randomStorage) return rand(); |