diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:44:45 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:46:17 +0200 |
| commit | 508b95899d4764d879a01b3990e44ce849cd9abc (patch) | |
| tree | 3dbb215480c98ee75b5aacc5e3d691e04d8ce8c8 /src/tools/uic | |
| parent | f2891be00808c82f5069661d60d8727fe28774b7 (diff) | |
| parent | 5d2939344eb8fbd3c2115f52a7a8d47365bdf820 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia36e93771066d8abcf8123dbe2362c5c9d9260fc
Diffstat (limited to 'src/tools/uic')
| -rw-r--r-- | src/tools/uic/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp index cb2bd430ff..12b0ee6737 100644 --- a/src/tools/uic/main.cpp +++ b/src/tools/uic/main.cpp @@ -52,9 +52,12 @@ #include <qcommandlineparser.h> QT_BEGIN_NAMESPACE +extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed; int runUic(int argc, char *argv[]) { + qt_qhash_seed.testAndSetRelaxed(-1, 0); // set the hash seed to 0 if it wasn't set yet + QCoreApplication app(argc, argv); QCoreApplication::setApplicationVersion(QString::fromLatin1(QT_VERSION_STR)); |