Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:57:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'tests' of git://github.com/SamGondelman/hifi into SamGondelman-tests

Browse source
This commit is contained in:
Howard Stearns 2019-05-13 14:26:15 -07:00
commit ee1231362c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/shared/src/DependencyManager.h
View file

@ -89,7 +89,7 @@ private:
QHash<size_t, QSharedPointer<Dependency>> _instanceHash; QHash<size_t, QSharedPointer<Dependency>> _instanceHash;
QHash<size_t, size_t> _inheritanceHash; QHash<size_t, size_t> _inheritanceHash;
mutable QMutex _instanceHashMutex; mutable QMutex _instanceHashMutex { QMutex::Recursive };
mutable QMutex _inheritanceHashMutex; mutable QMutex _inheritanceHashMutex;
bool _exiting { false }; bool _exiting { false };