diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-07 23:00:14 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-07 23:00:14 (GMT) |
| commit | 34ad8bd00efbc4f76066826f068b3d7bff0152c0 (patch) | |
| tree | da24f8987e5e26d85024fe2b5e7342625bd04e78 /src/network/kernel | |
| parent | 1e8479b2aa781e6ce3fadf01294023fbc6ddbc22 (diff) | |
| parent | 95e5e8ff45d2aa8acda595186136b54f695bb9cb (diff) | |
| download | Qt-34ad8bd00efbc4f76066826f068b3d7bff0152c0.zip Qt-34ad8bd00efbc4f76066826f068b3d7bff0152c0.tar.gz Qt-34ad8bd00efbc4f76066826f068b3d7bff0152c0.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qhostinfo_win.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp index 1cbf350..58a5bee 100644 --- a/src/network/kernel/qhostinfo_win.cpp +++ b/src/network/kernel/qhostinfo_win.cpp @@ -102,7 +102,7 @@ static void resolveLibrary() #if defined(Q_OS_WINCE) #include <qmutex.h> -QMutex qPrivCEMutex; +Q_GLOBAL_STATIC(QMutex, qPrivCEMutex) #endif QHostInfo QHostInfoAgent::fromName(const QString &hostName) @@ -110,8 +110,9 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) resolveLibrary(); #if defined(Q_OS_WINCE) - QMutexLocker locker(&qPrivCEMutex); + QMutexLocker locker(qPrivCEMutex()); #endif + QWindowsSockInit winSock; QHostInfo results; |