diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-14 06:19:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-14 06:19:34 (GMT) |
| commit | b01c2c90bf58a96afadc6fc5547203a6a37893c5 (patch) | |
| tree | 96125e444f32691c73bc87f0bc938993b7737899 /src/network/kernel/qhostinfo_win.cpp | |
| parent | 2e7a64a60be75f9f814cb5eb6839edde20b4baf2 (diff) | |
| parent | 01057867c3e5e97fc8b58601e3cee6dfef0df205 (diff) | |
| download | Qt-b01c2c90bf58a96afadc6fc5547203a6a37893c5.zip Qt-b01c2c90bf58a96afadc6fc5547203a6a37893c5.tar.gz Qt-b01c2c90bf58a96afadc6fc5547203a6a37893c5.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (69 commits)
runonphone timestamps nanosecond formating set to 9 chars, 0 padded
Add -nn for .cpp MOC preprocessing for INTEGRITY
Remove commented out code.
Update Polish translations for 4.8
Fixes: libpng symbols exported from QtGui.dll on Windows
omit unassigned (and too recent codepoints) from the text Normalization process
purge "Translation Rules for Plurals"
add -list-languages option to lupdate
Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
Ukrainian translation updated
QHostInfo: fix a race condition under CE
Do not let QGLContext get out of sync when doing mixed VG-GL rendering
Build fix for WINCE to qfilesystemengine_win.cpp
Fixed typo in QSettings documentation.
Doc updates to "Installing Qt for the Symbian Platform" page.
Create auto test for http HEAD request
QNAM - fix poor performance of HEAD request with authentication
Added Qt Quick Components link to document
remove dead code
Added text about -random and -seed options in QTest to changelog
...
Diffstat (limited to 'src/network/kernel/qhostinfo_win.cpp')
| -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 6fc5b7b..1052863 100644 --- a/src/network/kernel/qhostinfo_win.cpp +++ b/src/network/kernel/qhostinfo_win.cpp @@ -97,14 +97,15 @@ 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) { #if defined(Q_OS_WINCE) - QMutexLocker locker(&qPrivCEMutex); + QMutexLocker locker(qPrivCEMutex()); #endif + QWindowsSockInit winSock; // Load res_init on demand. |