diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 01:27:27 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 01:27:39 +0100 |
| commit | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (patch) | |
| tree | 897cf6bfb1814b0935982ff5975a6cbfb48d6d9e /src/corelib/thread/qthread_unix.cpp | |
| parent | 3d19422ef16a230bb11dbbfe4a8cc9667f39bf15 (diff) | |
| parent | 6c612c933803ef57ea45e907d0181b40659148ac (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Change-Id: I89dc2e193bd01624c1fb50484610d516e39b1538
Diffstat (limited to 'src/corelib/thread/qthread_unix.cpp')
| -rw-r--r-- | src/corelib/thread/qthread_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index d458ee9472..a0913e5dbc 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -287,7 +287,7 @@ void *QThreadPrivate::start(void *arg) else createEventDispatcher(data); -#if !defined(QT_NO_DEBUG) && (defined(Q_OS_LINUX) || defined(Q_OS_MAC)) +#if (defined(Q_OS_LINUX) || defined(Q_OS_MAC)) // sets the name of the current thread. QByteArray objectName = thr->objectName().toLocal8Bit(); |