Workaround webkit deadlock on macos x
authorShane Kearns <shane.kearns@accenture.com>
Tue, 21 Jun 2011 13:50:08 +0000 (14:50 +0100)
committerShane Kearns <shane.kearns@accenture.com>
Wed, 22 Jun 2011 09:40:55 +0000 (10:40 +0100)
commit38db40d9a2db44e47b0aabd9487284cd1106b353
tree55b436e2d8474a24dcb18cf5efc60afeb72d5383
parentf332786abc6817fefaa683fb22caa40184c1316e
Workaround webkit deadlock on macos x

The webkit AtomicallyInitializedStatic and Qt's Q_GLOBAL_STATIC can
deadlock on the Mac, as the mac compiler inserts calls to
__cxa_guard_acquire and __cxa_guard_release around initialisation of
local statics.
In Q_GLOBAL_STATIC case, this is the QGlobalStaticDeleter local static
Whereas webkit AtomicallyInitializedStatic is a local static variable
in any case.

Problem is triggered because webkit constructs QNetworkConfigurationManager
inside the constructor of a local static - networkStateNotifier
And the generic bearer plugin calls QNetworkInterface::allInterfaces
in the bearer thread, which needs an initialised Q_GLOBAL_STATIC.

Reviewed-by: Laszlo Agocs
src/plugins/bearer/generic/qgenericengine.cpp