Workaround webkit deadlock on macos x
authorShane Kearns <shane.kearns@accenture.com>
Tue, 21 Jun 2011 13:50:08 +0000 (14:50 +0100)
committerQt by Nokia <qt-info@nokia.com>
Mon, 12 Mar 2012 18:49:52 +0000 (19:49 +0100)
commit702b4cb5d464ac5abb97a3e75601b6a946673ee4
tree99629ff372575e97070b73b44f250717b6fab5a8
parentb5b41c18345719612e5411cc482466d2dbafdaf7
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
(cherry picked from commit 38db40d9a2db44e47b0aabd9487284cd1106b353)
Task-number: QTBUG-24554

Change-Id: Id2c7818faefb46e66b0bbc30ce30595d46d53016
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
src/plugins/bearer/generic/qgenericengine.cpp