diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_blackberry.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/thread/qmutex.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qelapsedtimer_unix.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index d231bdda61..cc907daa3a 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -114,7 +114,7 @@ QUrl is capable of detecting many errors in URLs while parsing it or when components of the URL are set with individual setter methods (like setScheme(), setHost() or setPath()). If the parsing or setter function is - succesful, any previously recorded error conditions will be discarded. + successful, any previously recorded error conditions will be discarded. By default, QUrl setter methods operate in QUrl::TolerantMode, which means they accept some common mistakes and mis-representation of data. An diff --git a/src/corelib/kernel/qeventdispatcher_blackberry.cpp b/src/corelib/kernel/qeventdispatcher_blackberry.cpp index 2252b73ad4..69b4a8b172 100644 --- a/src/corelib/kernel/qeventdispatcher_blackberry.cpp +++ b/src/corelib/kernel/qeventdispatcher_blackberry.cpp @@ -132,7 +132,7 @@ static int bpsIOHandler(int fd, int io_events, void *data) } // post unblock event to our thread; in this callback the bps channel is - // guarenteed to be the same that was active when bps_add_fd was called + // guaranteed to be the same that was active when bps_add_fd was called result = bps_push_event(event); if (result != BPS_SUCCESS) { qWarning("QEventDispatcherBlackberryPrivate::QEventDispatcherBlackberry: bps_push_event() failed"); diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp index 3815ce16a7..97a5e5738c 100644 --- a/src/corelib/thread/qmutex.cpp +++ b/src/corelib/thread/qmutex.cpp @@ -394,7 +394,7 @@ bool QBasicMutex::isRecursive() to wait on the mutex. There are two tricks to keep in mind: We don't want to increment waiters after we checked no threads are waiting (waiters == 0). That's why we atomically set the BigNumber flag on waiters when - we check waiters. Similarily, if waiters is decremented right after we checked, + we check waiters. Similarly, if waiters is decremented right after we checked, the mutex would be unlocked (d->wakeUp() has (or will) be called), but there is no thread waiting. This is only happening if there was a timeout in tryLock at the same time as the mutex is unlocked. So when there was a timeout, we set the @@ -531,7 +531,7 @@ void QBasicMutex::unlockInternal() Q_DECL_NOTHROW QMutexPrivate *d = reinterpret_cast<QMutexPrivate *>(copy); - // If no one is waiting for the lock anymore, we shoud reset d to 0x0. + // If no one is waiting for the lock anymore, we should reset d to 0x0. // Using fetchAndAdd, we atomically check that waiters was equal to 0, and add a flag // to the waiters variable (BigNumber). That way, we avoid the race in which waiters is // incremented right after we checked, because we won't increment waiters if is diff --git a/src/corelib/tools/qelapsedtimer_unix.cpp b/src/corelib/tools/qelapsedtimer_unix.cpp index 5dc18ce99f..b8f2180a5b 100644 --- a/src/corelib/tools/qelapsedtimer_unix.cpp +++ b/src/corelib/tools/qelapsedtimer_unix.cpp @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE * http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap02.html#tag_02_01_06 ) * * The macro _POSIX_MONOTONIC_CLOCK can therefore assume the following values: - * -1 monotonic clock is never supported on this sytem + * -1 monotonic clock is never supported on this system * 0 monotonic clock might be supported, runtime check is needed * >1 (such as 200809L) monotonic clock is always supported * |