diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:26:34 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:51:20 +0200 |
| commit | 5591e821358b9111c79336a66eac4d04bb5811ba (patch) | |
| tree | 4b4c1da4f5ccaead1cf4f487622de1d0b242b0b9 /src/corelib/thread | |
| parent | e4079eca49adce16e31dac2a18d49d7a55817891 (diff) | |
| parent | ca0c9f82cbf7c8c37acdcbdfdc3fa0c5fc138059 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ide5b3408bfefca410323cf26b810b44c06d3a227
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qmutex_unix.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/thread/qthread_unix.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/thread/qwaitcondition_unix.cpp | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/corelib/thread/qmutex_unix.cpp b/src/corelib/thread/qmutex_unix.cpp index a92ac4f943..df2f606a23 100644 --- a/src/corelib/thread/qmutex_unix.cpp +++ b/src/corelib/thread/qmutex_unix.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE static void report_error(int code, const char *where, const char *what) { if (code != 0) - qWarning("%s: %s failure: %s", where, what, qPrintable(qt_error_string(code))); + qErrnoWarning(code, "%s: %s failure", where, what); } #ifdef QT_UNIX_SEMAPHORE diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 8328e514a8..3d4c906dc2 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -714,8 +714,7 @@ void QThread::start(Priority priority) #endif // _POSIX_THREAD_ATTR_STACKSIZE if (code) { - qWarning("QThread::start: Thread stack size error: %s", - qPrintable(qt_error_string(code))); + qErrnoWarning(code, "QThread::start: Thread stack size error"); // we failed to set the stacksize, and as the documentation states, // the thread will fail to run... @@ -740,7 +739,7 @@ void QThread::start(Priority priority) pthread_attr_destroy(&attr); if (code) { - qWarning("QThread::start: Thread creation error: %s", qPrintable(qt_error_string(code))); + qErrnoWarning(code, "QThread::start: Thread creation error"); d->running = false; d->finished = false; @@ -759,8 +758,7 @@ void QThread::terminate() int code = pthread_cancel(from_HANDLE<pthread_t>(d->data->threadId.load())); if (code) { - qWarning("QThread::start: Thread termination error: %s", - qPrintable(qt_error_string((code)))); + qErrnoWarning(code, "QThread::start: Thread termination error"); } #endif } diff --git a/src/corelib/thread/qwaitcondition_unix.cpp b/src/corelib/thread/qwaitcondition_unix.cpp index 0ba90763cf..dd7475cec5 100644 --- a/src/corelib/thread/qwaitcondition_unix.cpp +++ b/src/corelib/thread/qwaitcondition_unix.cpp @@ -72,7 +72,7 @@ __attribute__((weakref("__pthread_cond_timedwait_relative"))); static void report_error(int code, const char *where, const char *what) { if (code != 0) - qWarning("%s: %s failure: %s", where, what, qPrintable(qt_error_string(code))); + qErrnoWarning(code, "%s: %s failure", where, what); } void qt_initialize_pthread_cond(pthread_cond_t *cond, const char *where) |