diff options
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qhash.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index fe49e8c6a8..b334a697a9 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -38,14 +38,6 @@ #ifndef _CRT_RAND_S #define _CRT_RAND_S #endif - -// Windows Runtime and CE use a QHash to fake environment variables. To avoid -// deadlock, disable reading the QT_HASH_SEED environment variable within -// QHash. -#if defined(Q_OS_WINRT) || defined(Q_OS_WINCE) -# define QHASH_NO_ENV_SEED -#endif - #include <stdlib.h> #include "qhash.h" @@ -231,11 +223,9 @@ static uint qt_create_qhash_seed() uint seed = 0; #ifndef QT_BOOTSTRAPPED -#ifdef QHASH_NO_ENV_SEED QByteArray envSeed = qgetenv("QT_HASH_SEED"); if (!envSeed.isNull()) return envSeed.toUInt(); -#endif // QHASH_NO_ENV_SEED #ifdef Q_OS_UNIX int randomfd = qt_safe_open("/dev/urandom", O_RDONLY); @@ -337,10 +327,8 @@ int qGlobalQHashSeed() */ void qSetGlobalQHashSeed(int newSeed) { -#ifdef QHASH_NO_ENV_SEED if (qEnvironmentVariableIsSet("QT_HASH_SEED")) return; -#endif // QHASH_NO_ENV_SEED if (newSeed == -1) { int x(qt_create_qhash_seed() & INT_MAX); qt_qhash_seed.store(x); @@ -1194,9 +1182,6 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW decimal value, will be used as the seed for qHash(). Alternatively, you can call the qSetGlobalQHashSeed() function. - \note The environment variable \c QT_HASH_SEED is unsupported on Windows - Runtime and CE. Use qSetGlobalQHashSeed() instead on those platforms. - \sa QHashIterator, QMutableHashIterator, QMap, QSet */ |