diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 12:12:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 12:12:10 (GMT) |
| commit | bd593fa64efebbe6608631ec9c08290414389c16 (patch) | |
| tree | 5fdad4f2827d6025ba4c3e8eba78a8438f90b1e4 /src/corelib/kernel/qsystemsemaphore_unix.cpp | |
| parent | 4676dd62871da2b58452ebda477a04c25158bec4 (diff) | |
| parent | 7a51c6023ffd2a6e222b842a34d62b7f3ce8db4b (diff) | |
| download | Qt-bd593fa64efebbe6608631ec9c08290414389c16.zip Qt-bd593fa64efebbe6608631ec9c08290414389c16.tar.gz Qt-bd593fa64efebbe6608631ec9c08290414389c16.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:
qdoc: Added online flag to the qdocconf file.
I10n: Update German translations for 4.7.0
Fix compile warning.
Report the error as being AlreadyExists if this is why it fails
move network scan to thread.
Diffstat (limited to 'src/corelib/kernel/qsystemsemaphore_unix.cpp')
| -rw-r--r-- | src/corelib/kernel/qsystemsemaphore_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp index 07e3618..d6c6c37 100644 --- a/src/corelib/kernel/qsystemsemaphore_unix.cpp +++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp @@ -145,10 +145,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) // Get semaphore semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); if (-1 == semaphore) { + setErrorString(QLatin1String("QSystemSemaphore::handle")); if (errno == EEXIST) semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); if (-1 == semaphore) { - setErrorString(QLatin1String("QSystemSemaphore::handle")); cleanHandle(); return -1; } |