Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/plugins/platforms/android/androidjniaccessibility.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp

Manually adjusted:
	mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
	to include 9ce697f2d54be6d94381c72af28dda79cbc027d4

Thanks goes to Sergio for the qnx mkspecs adjustments.

Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e

1 files changed, 8 insertions, 8 deletions

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)