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

Change-Id: I57b06e2e98beb010a56dd0593d93e078ecf76eea

3 files changed, 7 insertions, 4 deletions

diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h
index fe8fc66b03..5a3939b7b2 100644
--- a/src/3rdparty/masm/stubs/ExecutableAllocator.h
+++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h
@@ -57,6 +57,10 @@
 #include <unistd.h>
 #endif
 
+#ifdef __QNXNTO__
+using std::perror;
+#endif
+
 namespace JSC {
 
 class JSGlobalData;
diff --git a/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h b/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h
index 21436b0bec..0e18132f77 100644
--- a/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h
+++ b/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h
@@ -101,8 +101,8 @@ public:
 private:
     template <typename PtrType> friend PassOwnPtr<PtrType> adoptPtr(PtrType*);
 
-    PassOwnPtr<T>& operator=(const PassOwnPtr<T>&)
-    {}
+    PassOwnPtr<T>& operator=(const PassOwnPtr<T>& t);
+
     mutable QScopedPointer<T> m_ptr;
 };
 
diff --git a/src/3rdparty/masm/stubs/wtf/PassRefPtr.h b/src/3rdparty/masm/stubs/wtf/PassRefPtr.h
index 1a837464fa..f072e70dd7 100644
--- a/src/3rdparty/masm/stubs/wtf/PassRefPtr.h
+++ b/src/3rdparty/masm/stubs/wtf/PassRefPtr.h
@@ -81,8 +81,7 @@ public:
     }
 
 private:
-    PassRefPtr<T>& operator=(const PassRefPtr<T>&)
-    {}
+    PassRefPtr<T>& operator=(const PassRefPtr<T>& t);
 
     template <typename PtrType> friend PassRefPtr<PtrType> adoptRef(PtrType*);
     mutable T* m_ptr;