From a65471a8d5b0c084e2089616a3367c0438548b5e Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Fri, 23 Oct 2015 14:42:42 +0200 Subject: Doc: corrected link to external source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Link to manual Javascript available online. Task-number: QTBUG-48258 Change-Id: I5bf2e8af2f1f5d795a47f82ffe553c174726854b Reviewed-by: Topi Reiniö --- src/script/doc/src/external-resources.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */ -- cgit v1.2.3 From a239a7e6d8a9b51ba27ee3616e9a6d320081387c Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Sun, 24 Jan 2016 11:39:04 +0000 Subject: Fix build with clang/c++1z due to register keyword dtoa.cpp:794:5: error: ISO C++1z does not allow 'register' storage class specifier [-Wregister] Change-Id: I800ba0eb11fb55db8600a0eb937689e082c41c31 Reviewed-by: Simon Hausmann --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/dtoa.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3 From 19c0ae1d8e58d1aaa4b71e5fc326bf5d04bc050b Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Fri, 22 Jan 2016 13:56:51 +0100 Subject: Doc: corrected invalid qdoc \relates statement Change-Id: I6a73ed6b4eeb241be574f0ddc041f554e120003b Task-number: QTBUG-43810 Reviewed-by: Martin Smith --- src/script/api/qscriptengine.cpp | 2 -- 1 file changed, 2 deletions(-) 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 *)}. -- cgit v1.2.3 From a70f6a1b9599931fccd13b15a1700e61137f7e72 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Wed, 3 Feb 2016 11:42:43 +0100 Subject: Use build-in time functions of WEC2013 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Time functions are supported with WEC2013 and do not need to be implemented. Task-number: QTBUG-50851 Change-Id: I4344b85808bd34467f239bf299b82e969544b7cb Reviewed-by: Jędrzej Nowacki Reviewed-by: Simon Hausmann --- src/3rdparty/ce-compat/ce_time.c | 3 +++ src/3rdparty/ce-compat/ce_time.h | 4 ++++ 2 files changed, 7 insertions(+) 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 #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 +#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__) */ -- cgit v1.2.3 From a5e814fd8809dd6a8a3c3efd4b911b36e3325a2a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 8 Feb 2016 14:56:20 +0100 Subject: Bump version Change-Id: I9e249aa3456a74f5a6a35626ae9bea04ddc5e4e6 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 83a7526..cc974f4 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs android|boot2qt: CONFIG -= headersclean -MODULE_VERSION = 5.6.0 +MODULE_VERSION = 5.6.1 -- cgit v1.2.3