3 files changed, 10 insertions, 9 deletions
diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp
index 33e85c1505..b2043a45a1 100644
--- a/src/corelib/thread/qatomic.cpp
+++ b/src/corelib/thread/qatomic.cpp
@@ -58,6 +58,7 @@
     \inmodule QtCore
     \brief The QAtomicInteger class provides platform-independent atomic operations on integers.
     \ingroup thread
+    \since 5.3
 
     For atomic operations on pointers, see the QAtomicPointer class.
 
diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp
index fe5beb1c01..5e3f3a1cab 100644
--- a/src/corelib/thread/qmutex.cpp
+++ b/src/corelib/thread/qmutex.cpp
@@ -380,7 +380,7 @@ bool QBasicMutex::isRecursive()
 */
 
 /*!
-    \fn QMutex *QMutexLocker::mutex()
+    \fn QMutex *QMutexLocker::mutex() const
 
     Returns the mutex on which the QMutexLocker is operating.
 
diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h
index 0ecc96a9b1..011555f904 100644
--- a/src/corelib/thread/qmutex.h
+++ b/src/corelib/thread/qmutex.h
@@ -77,7 +77,7 @@ public:
         return fastTryLock();
     }
 
-    bool isRecursive();
+    bool isRecursive(); //### Qt6: mark const
 
 private:
     inline bool fastTryLock() Q_DECL_NOTHROW {
@@ -186,10 +186,10 @@ public:
 
     inline explicit QMutex(RecursionMode mode = NonRecursive) { Q_UNUSED(mode); }
 
-    static inline void lock() {}
-    static inline bool tryLock(int timeout = 0) { Q_UNUSED(timeout); return true; }
-    static inline void unlock() {}
-    static inline bool isRecursive() { return true; }
+    inline void lock() {}
+    inline bool tryLock(int timeout = 0) { Q_UNUSED(timeout); return true; }
+    inline void unlock() {}
+    inline bool isRecursive() { return true; }
 
 private:
     Q_DISABLE_COPY(QMutex)
@@ -201,9 +201,9 @@ public:
     inline explicit QMutexLocker(QMutex *) {}
     inline ~QMutexLocker() {}
 
-    static inline void unlock() {}
-    static void relock() {}
-    static inline QMutex *mutex() { return 0; }
+    inline void unlock() {}
+    void relock() {}
+    inline QMutex *mutex() const { return 0; }
 
 private:
     Q_DISABLE_COPY(QMutexLocker)