summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qthread.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-08-06 16:10:33 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-18 08:34:53 +0200
commit8ab56793276eef297483fa203bb6fe40dc20c76d (patch)
tree1488180e7d2bb33152f6dd2bb313c222181e98a0 /src/corelib/thread/qthread.h
parent2ef3ac72fc068b825f2185ab3682219dc7246464 (diff)
Mark simple static methods in QThread as Q_DECL_NOTHROW
These methods aren't often used, but currentThreadId() gets used in the recursive mutex code to store the identity of the thread with multiple locks. Change-Id: I031cf3893aa6e7fd7a53733fc1088d295bdb9079 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread/qthread.h')
-rw-r--r--src/corelib/thread/qthread.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
index 953632c6fc..978dbe8b19 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -59,9 +59,9 @@ class QAbstractEventDispatcher;
class Q_CORE_EXPORT QThread : public QObject
{
public:
- static Qt::HANDLE currentThreadId();
+ static Qt::HANDLE currentThreadId() Q_DECL_NOTHROW;
static QThread *currentThread();
- static int idealThreadCount();
+ static int idealThreadCount() Q_DECL_NOTHROW;
static void yieldCurrentThread();
explicit QThread(QObject *parent = 0);