Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: I125a7421f2d449b5670fbb250ad167d97f156fff

5 files changed, 9 insertions, 4 deletions

diff --git a/src/3rdparty/ce-compat/ce_time.c b/src/3rdparty/ce-compat/ce_time.c
index 92efae0..37ac523 100644
--- a/src/3rdparty/ce-compat/ce_time.c
+++ b/src/3rdparty/ce-compat/ce_time.c
@@ -42,6 +42,7 @@
 #include <time.h>
 #include "ce_time.h"
 
+#if _WIN32_WCE < 0x800
 time_t
 time(time_t* timer)
 {
@@ -675,3 +676,5 @@ localtime(const time_t *timer)
 {
 	return gmtime(timer);
 }
+
+#endif
diff --git a/src/3rdparty/ce-compat/ce_time.h b/src/3rdparty/ce-compat/ce_time.h
index 07ca094..6cd33e1 100644
--- a/src/3rdparty/ce-compat/ce_time.h
+++ b/src/3rdparty/ce-compat/ce_time.h
@@ -5,12 +5,14 @@
 /* we need to prototype the time functions for Windows CE >= 6.0 */
 #include <crtdefs.h>
 
+#if _WIN32_WCE < 0x800
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct tm;
 
+
 time_t time(time_t* timer);
 time_t mktime(struct tm *t);
 size_t strftime(char * const s, const size_t maxsize, const char * const format, const struct tm * const t);
@@ -20,6 +22,8 @@ struct tm *localtime(const time_t *timer);
 }   /* closing brace for extern "C" */
 #endif
 
+#endif // _WIN32_WCE < 0x800
+
 #endif /* defined(_WIN32_WCE) && _WIN32_WCE >= 0x600 */
 
 #endif /* !defined(__CE_TIME_H__) */
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/dtoa.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/dtoa.cpp
index 97c6c8f..885b526 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/dtoa.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/dtoa.cpp
@@ -791,7 +791,7 @@ static ALWAYS_INLINE void diff(BigInt& c, const BigInt& aRef, const BigInt& bRef
 
 static double ulp(U *x)
 {
-    register int32_t L;
+    int32_t L;
     U u;
 
     L = (word0(x) & Exp_mask) - (P - 1) * Exp_msk1;
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 699d2e6..3719cdf 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -3035,7 +3035,6 @@ void QScriptEngine::setDefaultPrototype(int metaTypeId, const QScriptValue &prot
 
 /*!
   \typedef QScriptEngine::FunctionSignature
-  \relates QScriptEngine
 
   The function signature \c{QScriptValue f(QScriptContext *, QScriptEngine *)}.
 
@@ -3045,7 +3044,6 @@ void QScriptEngine::setDefaultPrototype(int metaTypeId, const QScriptValue &prot
 
 /*!
   \typedef QScriptEngine::FunctionWithArgSignature
-  \relates QScriptEngine
 
   The function signature \c{QScriptValue f(QScriptContext *, QScriptEngine *, void *)}.
 
diff --git a/src/script/doc/src/external-resources.qdoc b/src/script/doc/src/external-resources.qdoc
index 19b30e7..5226e8a 100644
--- a/src/script/doc/src/external-resources.qdoc
+++ b/src/script/doc/src/external-resources.qdoc
@@ -31,6 +31,6 @@
 */
 
 /*!
-    \externalpage http://www.davidflanagan.com/javascript5/
+    \externalpage http://shop.oreilly.com/product/9780596805531.do
     \title JavaScript: The Definitive Guide
 */