diff options
author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-09-21 15:53:49 +0200 |
---|---|---|
committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-09-22 14:17:46 +0000 |
commit | a14fadfb640103ecea76c3966cf23668bb7f448b (patch) | |
tree | a8a9de3fca0070109066085e3c467ec21534129f /tests/auto/dbus | |
parent | 863dfb1541f4f0865a6e4ee42dbef159eaa7f2d0 (diff) | |
download | qtbase-a14fadfb640103ecea76c3966cf23668bb7f448b.tar.gz |
Add getter and setter for qt_qhash_seed
In some cases it's not possible to use QT_HASH_SEED, specially when
we need to set the environment variable from inside the application,
as dynamically loaded libraries or plugins may create static QHash
instances. That would set qt_qhash_seed to a value different from
-1 and skip the env var value.
For those cases, and when we still want to set qt_qhash_seed, we
provide a way to enforce its value.
Auto-tests accessing qt_qhash_seed directly have been updated
accordingly. Usage in qdoc, uic and rcc has been left as is
for the time being.
Change-Id: I3b35b4fa0223c83b1348a6508641905a2a63266f
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'tests/auto/dbus')
-rw-r--r-- | tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp index 4dbe0aae7d..c57292b7db 100644 --- a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp +++ b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp @@ -64,15 +64,10 @@ private slots: void properties(); }; -QT_BEGIN_NAMESPACE -// Avoid QHash randomization so that the order of the XML attributes is stable -extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed; // from qhash.cpp -QT_END_NAMESPACE - void tst_QDBusXmlParser::initTestCase() { // Always initialize the hash seed to 0 to get reliable test results - qt_qhash_seed.store(0); + qSetGlobalQHashSeed(0); } void tst_QDBusXmlParser::parsing_data() |