diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 06:43:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 06:43:20 (GMT) |
| commit | 834907be1ebea35ac933ef2fe48658b983057820 (patch) | |
| tree | 280853036b7c5cac36760fa20047f92f31587b37 /src/corelib/thread/qmutexpool.cpp | |
| parent | 4b029b2882d9dd59893807b2db72efc43792aafd (diff) | |
| parent | f3ac9de816c0bff9961110c5a734871da2e129cf (diff) | |
| download | Qt-834907be1ebea35ac933ef2fe48658b983057820.zip Qt-834907be1ebea35ac933ef2fe48658b983057820.tar.gz Qt-834907be1ebea35ac933ef2fe48658b983057820.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits)
Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression
add performance comparisons to qregexp benchmark
configure: fix error message when calling config.status
Fix invalid memory write during recursive timer activation
Added comment about calendarPopup in setCalendarWidget function documentation.
doc: Fixed some qdoc errors.
Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.
CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.
XmlListModel doc fixes
Mention QML_IMPORT_TRACE in Modules docs
Merge sections about when property and default state
Explain Flipable example further
PathView required some diagonal movement before a drag was initiated.
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0.
doc: Fixed some qdoc errors.
Add Ukrainian translation.
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
...
Diffstat (limited to 'src/corelib/thread/qmutexpool.cpp')
| -rw-r--r-- | src/corelib/thread/qmutexpool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qmutexpool.cpp b/src/corelib/thread/qmutexpool.cpp index d9abdc5..59211fb 100644 --- a/src/corelib/thread/qmutexpool.cpp +++ b/src/corelib/thread/qmutexpool.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -// qt_global_mutexpool is here for backwards compatability only, +// qt_global_mutexpool is here for backwards compatibility only, // use QMutexpool::instance() in new clode. Q_CORE_EXPORT QMutexPool *qt_global_mutexpool = 0; Q_GLOBAL_STATIC_WITH_ARGS(QMutexPool, globalMutexPool, (QMutex::Recursive)) |